365 files changed, 64495 insertions, 64221 deletions

diff --git a/.mailmap b/.mailmap
index d9e31ee6..170efecb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@ Thorbjørn Lindeijer <bjorn@horst-dieter.(none)>
 Dennis Friis <peavey@inspircd.org>
 Falkreon <Falkreon@.(none)>
 Ira Rice <irarice@gmail.com>
+MadCamel <madcamel@gmail.com>
 Majin Sniper <sniper@livecd.janhome.net>
 Maximilian Philipps <turmfalke@Turmfalke.(none)>
 remoitnane <remoit(DOT)nane(AT)gmail(DOT)com>
diff --git a/CMake/Modules/FindGuichan.cmake b/CMake/Modules/FindGuichan.cmake
index 1623b00d..dbc863e2 100644
--- a/CMake/Modules/FindGuichan.cmake
+++ b/CMake/Modules/FindGuichan.cmake
@@ -85,6 +85,13 @@ FOREACH (COMPONENT ${Guichan_FIND_COMPONENTS})
         MESSAGE(FATAL_ERROR "Could NOT find Guichan component ${COMPONENT}")
     ENDIF ()
 
+    # Check guichan >= 0.8.0 by searching for the widgetlistener.hpp file.
+    SET(Guichan_HEADER "guichan/widgetlistener.hpp")
+    IF (NOT EXISTS ${Guichan_INCLUDE_DIR}/${Guichan_HEADER})
+            SET(GUICHAN_FOUND FALSE)
+            MESSAGE(FATAL_ERROR "Guichan version is less than 0.8.0")
+    ENDIF()
+
     IF (NOT Guichan_FIND_QUIETLY AND NOT Guichan_QUIET)
         MESSAGE(STATUS "Found Guichan ${COMPONENT}: ${Guichan_LIBRARY_${COMPONENT}}")
     ENDIF ()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4244dad9..fc188943 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_POLICY(VERSION 2.6)
 PROJECT(MANA)
 
 IF (NOT VERSION)
-    SET(VERSION 0.5.1)
+    SET(VERSION 1.0.0)
 ENDIF()
 
 STRING(REPLACE "." " " _VERSION ${VERSION})
@@ -30,7 +30,7 @@ FIND_PACKAGE(Gettext)
 
 OPTION(WITH_OPENGL "Enable OpenGL support" ON)
 OPTION(ENABLE_NLS "Enable building of tranlations" ON)
-OPTION(ENABLE_MANASERV "Enable Manaserv support" OFF)
+OPTION(ENABLE_MANASERV "Enable Manaserv support" ON)
 
 IF (WIN32)
     SET(PKG_DATADIR ".")
@@ -38,7 +38,7 @@ IF (WIN32)
     SET(LOCALEDIR ".")
     CONFIGURE_FILE(src/winver.h.in src/winver.h)
 ELSE (WIN32)
-    IF (NOT OSX)
+    IF (NOT OSX AND NOT BEOS)
         OPTION(USE_X11 "Use X11 Clipboard functionality" ON)
     ENDIF ()
     SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana)
diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
index 5a9b0f65..a46ccfd0 100644
--- a/data/graphics/CMakeLists.txt
+++ b/data/graphics/CMakeLists.txt
@@ -1,3 +1,12 @@
 ADD_SUBDIRECTORY(gui)
 ADD_SUBDIRECTORY(images)
 ADD_SUBDIRECTORY(sprites)
+
+SET (FILES
+    target-cursor-in-range-l.png
+    target-cursor-in-range-m.png
+    target-cursor-in-range-s.png
+    target-cursor-normal-l.png
+    target-cursor-normal-m.png
+    target-cursor-normal-s.png
+    )
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index a7c21e5e..92a1e3ef 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -32,12 +32,6 @@ SET (FILES
     tab.png
     tab_hilight.png
     tabselected.png
-    target-cursor-blue-l.png
-    target-cursor-blue-m.png
-    target-cursor-blue-s.png
-    target-cursor-red-l.png
-    target-cursor-red-m.png
-    target-cursor-red-s.png
     unknown-item.png
     vscroll_down_default.png
     vscroll_down_highlight.png
diff --git a/data/graphics/gui/target-cursor-blue-l.png b/data/graphics/target-cursor-in-range-l.png
index 77cdf4b6..77cdf4b6 100644
--- a/data/graphics/gui/target-cursor-blue-l.png
+++ b/data/graphics/target-cursor-in-range-l.png
diff --git a/data/graphics/gui/target-cursor-blue-m.png b/data/graphics/target-cursor-in-range-m.png
index c0107357..c0107357 100644
--- a/data/graphics/gui/target-cursor-blue-m.png
+++ b/data/graphics/target-cursor-in-range-m.png
diff --git a/data/graphics/gui/target-cursor-blue-s.png b/data/graphics/target-cursor-in-range-s.png
index 3e81c75d..3e81c75d 100644
--- a/data/graphics/gui/target-cursor-blue-s.png
+++ b/data/graphics/target-cursor-in-range-s.png
diff --git a/data/graphics/gui/target-cursor-red-l.png b/data/graphics/target-cursor-normal-l.png
index 76d2101b..76d2101b 100644
--- a/data/graphics/gui/target-cursor-red-l.png
+++ b/data/graphics/target-cursor-normal-l.png
diff --git a/data/graphics/gui/target-cursor-red-m.png b/data/graphics/target-cursor-normal-m.png
index e2ab79c2..e2ab79c2 100644
--- a/data/graphics/gui/target-cursor-red-m.png
+++ b/data/graphics/target-cursor-normal-m.png
diff --git a/data/graphics/gui/target-cursor-red-s.png b/data/graphics/target-cursor-normal-s.png
index 09195f44..09195f44 100644
--- a/data/graphics/gui/target-cursor-red-s.png
+++ b/data/graphics/target-cursor-normal-s.png
diff --git a/libs/enet/CMakeLists.txt b/libs/enet/CMakeLists.txt
index 714d9c03..52895918 100644
--- a/libs/enet/CMakeLists.txt
+++ b/libs/enet/CMakeLists.txt
@@ -52,4 +52,7 @@ SET (SRCS
 INCLUDE_DIRECTORIES("include")
 
 ADD_LIBRARY(enet STATIC ${SRCS})
-SET_TARGET_PROPERTIES(enet PROPERTIES COMPILE_FLAGS "${FLAGS}")
\ No newline at end of file
+IF (BEOS)
+  TARGET_LINK_LIBRARIES(enet network)
+ENDIF()
+SET_TARGET_PROPERTIES(enet PROPERTIES COMPILE_FLAGS "${FLAGS}")
diff --git a/libs/enet/ChangeLog b/libs/enet/ChangeLog
index 45f14db6..b1fc2008 100644
--- a/libs/enet/ChangeLog
+++ b/libs/enet/ChangeLog
@@ -1,3 +1,9 @@
+ENet 1.3.1 (February 10, 2011):
+
+* fixed bug in tracking of reliable data in transit
+* reliable data window size now scales with the throttle
+* fixed bug in fragment length calculation when checksums are used
+
 ENet 1.3.0 (June 5, 2010):
 
 * enet_host_create() now requires the channel limit to be specified as
diff --git a/libs/enet/LICENSE b/libs/enet/LICENSE
index df0f91e9..357a4e5c 100644
--- a/libs/enet/LICENSE
+++ b/libs/enet/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2002-2010 Lee Salzman
+Copyright (c) 2002-2011 Lee Salzman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/libs/enet/include/enet/enet.h b/libs/enet/include/enet/enet.h
index 2f656d6c..b572590e 100644
--- a/libs/enet/include/enet/enet.h
+++ b/libs/enet/include/enet/enet.h
@@ -25,7 +25,7 @@ extern "C"
 
 #define ENET_VERSION_MAJOR 1
 #define ENET_VERSION_MINOR 3
-#define ENET_VERSION_PATCH 0
+#define ENET_VERSION_PATCH 1
 #define ENET_VERSION_CREATE(major, minor, patch) (((major)<<16) | ((minor)<<8) | (patch))
 #define ENET_VERSION ENET_VERSION_CREATE(ENET_VERSION_MAJOR, ENET_VERSION_MINOR, ENET_VERSION_PATCH)
 
diff --git a/libs/enet/list.c b/libs/enet/list.c
index 8487200f..1c1a8dfa 100644
--- a/libs/enet/list.c
+++ b/libs/enet/list.c
@@ -3,7 +3,7 @@
  @brief ENet linked list functions
 */
 #define ENET_BUILDING_LIB 1
-#include "enet/list.h"
+#include "enet/enet.h"
 
 /** 
     @defgroup list ENet linked list utility functions
diff --git a/libs/enet/peer.c b/libs/enet/peer.c
index d778ce1d..e1c117f8 100644
--- a/libs/enet/peer.c
+++ b/libs/enet/peer.c
@@ -108,6 +108,8 @@ enet_peer_send (ENetPeer * peer, enet_uint8 channelID, ENetPacket * packet)
      return -1;
 
    fragmentLength = peer -> mtu - sizeof (ENetProtocolHeader) - sizeof (ENetProtocolSendFragment);
+   if (peer -> host -> checksum != NULL)
+     fragmentLength -= sizeof(enet_uint32);
 
    if (packet -> dataLength > fragmentLength)
    {
diff --git a/libs/enet/protocol.c b/libs/enet/protocol.c
index 8e26dfb2..2237ba84 100644
--- a/libs/enet/protocol.c
+++ b/libs/enet/protocol.c
@@ -172,6 +172,7 @@ enet_protocol_remove_sent_reliable_command (ENetPeer * peer, enet_uint16 reliabl
     ENetOutgoingCommand * outgoingCommand;
     ENetListIterator currentCommand;
     ENetProtocolCommand commandNumber;
+    int wasSent = 1;
 
     for (currentCommand = enet_list_begin (& peer -> sentReliableCommands);
          currentCommand != enet_list_end (& peer -> sentReliableCommands);
@@ -201,6 +202,8 @@ enet_protocol_remove_sent_reliable_command (ENetPeer * peer, enet_uint16 reliabl
 
        if (currentCommand == enet_list_end (& peer -> outgoingReliableCommands))
          return ENET_PROTOCOL_COMMAND_NONE;
+
+       wasSent = 0;
     }
 
     if (channelID < peer -> channelCount)
@@ -221,7 +224,8 @@ enet_protocol_remove_sent_reliable_command (ENetPeer * peer, enet_uint16 reliabl
 
     if (outgoingCommand -> packet != NULL)
     {
-       peer -> reliableDataInTransit -= outgoingCommand -> fragmentLength;
+       if (wasSent)
+         peer -> reliableDataInTransit -= outgoingCommand -> fragmentLength;
 
        -- outgoingCommand -> packet -> referenceCount;
 
@@ -1252,7 +1256,7 @@ enet_protocol_check_timeouts (ENetHost * host, ENetPeer * peer, ENetEvent * even
     return 0;
 }
 
-static void
+static int
 enet_protocol_send_reliable_outgoing_commands (ENetHost * host, ENetPeer * peer)
 {
     ENetProtocol * command = & host -> commands [host -> commandCount];
@@ -1262,6 +1266,7 @@ enet_protocol_send_reliable_outgoing_commands (ENetHost * host, ENetPeer * peer)
     ENetChannel *channel;
     enet_uint16 reliableWindow;
     size_t commandSize;
+    int windowExceeded = 0, windowWrap = 0, canPing = 1;
 
     currentCommand = enet_list_begin (& peer -> outgoingReliableCommands);
     
@@ -1271,37 +1276,54 @@ enet_protocol_send_reliable_outgoing_commands (ENetHost * host, ENetPeer * peer)
 
        channel = outgoingCommand -> command.header.channelID < peer -> channelCount ? & peer -> channels [outgoingCommand -> command.header.channelID] : NULL;
        reliableWindow = outgoingCommand -> reliableSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE;
-       if (channel != NULL && 
-           outgoingCommand -> sendAttempts < 1 && 
-           ! (outgoingCommand -> reliableSequenceNumber % ENET_PEER_RELIABLE_WINDOW_SIZE) &&
-           (channel -> reliableWindows [(reliableWindow + ENET_PEER_RELIABLE_WINDOWS - 1) % ENET_PEER_RELIABLE_WINDOWS] >= ENET_PEER_RELIABLE_WINDOW_SIZE ||
-             channel -> usedReliableWindows & ((((1 << ENET_PEER_FREE_RELIABLE_WINDOWS) - 1) << reliableWindow) | 
-               (((1 << ENET_PEER_FREE_RELIABLE_WINDOWS) - 1) >> (ENET_PEER_RELIABLE_WINDOW_SIZE - reliableWindow)))))
-         break;
-  
+       if (channel != NULL)
+       {
+           if (! windowWrap &&      
+               outgoingCommand -> sendAttempts < 1 && 
+               ! (outgoingCommand -> reliableSequenceNumber % ENET_PEER_RELIABLE_WINDOW_SIZE) &&
+               (channel -> reliableWindows [(reliableWindow + ENET_PEER_RELIABLE_WINDOWS - 1) % ENET_PEER_RELIABLE_WINDOWS] >= ENET_PEER_RELIABLE_WINDOW_SIZE ||
+                 channel -> usedReliableWindows & ((((1 << ENET_PEER_FREE_RELIABLE_WINDOWS) - 1) << reliableWindow) | 
+                   (((1 << ENET_PEER_FREE_RELIABLE_WINDOWS) - 1) >> (ENET_PEER_RELIABLE_WINDOW_SIZE - reliableWindow)))))
+             windowWrap = 1;
+          if (windowWrap)
+          {
+             currentCommand = enet_list_next (currentCommand);
+ 
+             continue;
+          }
+       }
+ 
+       if (outgoingCommand -> packet != NULL)
+       {
+          if (! windowExceeded)
+          {
+             enet_uint32 windowSize = (peer -> packetThrottle * peer -> windowSize) / ENET_PEER_PACKET_THROTTLE_SCALE;
+             
+             if (peer -> reliableDataInTransit + outgoingCommand -> fragmentLength > ENET_MAX (windowSize, peer -> mtu))
+               windowExceeded = 1;
+          }
+          if (windowExceeded)
+          {
+             currentCommand = enet_list_next (currentCommand);
+
+             continue;
+          }
+       }
+
+       canPing = 0;
+
        commandSize = commandSizes [outgoingCommand -> command.header.command & ENET_PROTOCOL_COMMAND_MASK];
        if (command >= & host -> commands [sizeof (host -> commands) / sizeof (ENetProtocol)] ||
            buffer + 1 >= & host -> buffers [sizeof (host -> buffers) / sizeof (ENetBuffer)] ||
-           peer -> mtu - host -> packetSize < commandSize)
+           peer -> mtu - host -> packetSize < commandSize ||
+           (outgoingCommand -> packet != NULL && 
+             (enet_uint16) (peer -> mtu - host -> packetSize) < (enet_uint16) (commandSize + outgoingCommand -> fragmentLength)))
        {
           host -> continueSending = 1;
           
           break;
        }
 
-       if (outgoingCommand -> packet != NULL)
-       {
-          if (peer -> reliableDataInTransit + outgoingCommand -> fragmentLength > peer -> windowSize)
-            break;
-
-          if ((enet_uint16) (peer -> mtu - host -> packetSize) < (enet_uint16) (commandSize + outgoingCommand -> fragmentLength))
-          {
-             host -> continueSending = 1;
-
-             break;
-          }
-       }
-      
        currentCommand = enet_list_next (currentCommand);
 
        if (channel != NULL && outgoingCommand -> sendAttempts < 1)
@@ -1354,6 +1376,8 @@ enet_protocol_send_reliable_outgoing_commands (ENetHost * host, ENetPeer * peer)
 
     host -> commandCount = command - host -> commands;
     host -> bufferCount = buffer - host -> buffers;
+
+    return canPing;
 }
 
 static int
@@ -1391,10 +1415,9 @@ enet_protocol_send_outgoing_commands (ENetHost * host, ENetEvent * event, int ch
             enet_protocol_check_timeouts (host, currentPeer, event) == 1)
           return 1;
 
-        if (! enet_list_empty (& currentPeer -> outgoingReliableCommands))
-          enet_protocol_send_reliable_outgoing_commands (host, currentPeer);
-        else
-        if (enet_list_empty (& currentPeer -> sentReliableCommands) &&
+        if ((enet_list_empty (& currentPeer -> outgoingReliableCommands) ||
+              enet_protocol_send_reliable_outgoing_commands (host, currentPeer)) &&
+            enet_list_empty (& currentPeer -> sentReliableCommands) &&
             ENET_TIME_DIFFERENCE (host -> serviceTime, currentPeer -> lastReceiveTime) >= ENET_PEER_PING_INTERVAL &&
             currentPeer -> mtu - host -> packetSize >= sizeof (ENetProtocolPing))
         { 
diff --git a/mana.cbp b/mana.cbp
index 1d8fd131..22b0550b 100644
--- a/mana.cbp
+++ b/mana.cbp
@@ -111,6 +111,12 @@
 		<Unit filename="libs\enet\win32.c" />
 		<Unit filename="src\SDLMain.h" />
 		<Unit filename="src\SDLMain.m" />
+		<Unit filename="src\actor.cpp" />
+		<Unit filename="src\actor.h" />
+		<Unit filename="src\actorsprite.cpp" />
+		<Unit filename="src\actorsprite.h" />
+		<Unit filename="src\actorspritemanager.cpp" />
+		<Unit filename="src\actorspritemanager.h" />
 		<Unit filename="src\animatedsprite.cpp" />
 		<Unit filename="src\animatedsprite.h" />
 		<Unit filename="src\animationparticle.cpp" />
@@ -119,28 +125,31 @@
 		<Unit filename="src\avatar.h" />
 		<Unit filename="src\being.cpp" />
 		<Unit filename="src\being.h" />
-		<Unit filename="src\beingmanager.cpp" />
-		<Unit filename="src\beingmanager.h" />
 		<Unit filename="src\channel.cpp" />
 		<Unit filename="src\channel.h" />
 		<Unit filename="src\channelmanager.cpp" />
 		<Unit filename="src\channelmanager.h" />
+		<Unit filename="src\chatlog.cpp" />
+		<Unit filename="src\chatlog.h" />
 		<Unit filename="src\client.cpp" />
 		<Unit filename="src\client.h" />
 		<Unit filename="src\commandhandler.cpp" />
 		<Unit filename="src\commandhandler.h" />
-		<Unit filename="src\configlistener.h" />
+		<Unit filename="src\compoundsprite.cpp" />
+		<Unit filename="src\compoundsprite.h" />
 		<Unit filename="src\configuration.cpp" />
 		<Unit filename="src\configuration.h" />
+		<Unit filename="src\defaults.cpp" />
+		<Unit filename="src\defaults.h" />
 		<Unit filename="src\effectmanager.cpp" />
 		<Unit filename="src\effectmanager.h" />
 		<Unit filename="src\emoteshortcut.cpp" />
 		<Unit filename="src\emoteshortcut.h" />
 		<Unit filename="src\equipment.h" />
+		<Unit filename="src\event.cpp" />
+		<Unit filename="src\event.h" />
 		<Unit filename="src\flooritem.cpp" />
 		<Unit filename="src\flooritem.h" />
-		<Unit filename="src\flooritemmanager.cpp" />
-		<Unit filename="src\flooritemmanager.h" />
 		<Unit filename="src\game.cpp" />
 		<Unit filename="src\game.h" />
 		<Unit filename="src\graphics.cpp" />
@@ -243,8 +252,6 @@
 		<Unit filename="src\gui\textdialog.h" />
 		<Unit filename="src\gui\textpopup.cpp" />
 		<Unit filename="src\gui\textpopup.h" />
-		<Unit filename="src\gui\theme.cpp" />
-		<Unit filename="src\gui\theme.h" />
 		<Unit filename="src\gui\trade.cpp" />
 		<Unit filename="src\gui\trade.h" />
 		<Unit filename="src\gui\truetypefont.cpp" />
@@ -252,8 +259,6 @@
 		<Unit filename="src\gui\unregisterdialog.cpp" />
 		<Unit filename="src\gui\unregisterdialog.h" />
 		<Unit filename="src\gui\updatewindow.cpp" />
-		<Unit filename="src\gui\userpalette.cpp" />
-		<Unit filename="src\gui\userpalette.h" />
 		<Unit filename="src\gui\updatewindow.h" />
 		<Unit filename="src\gui\viewport.cpp" />
 		<Unit filename="src\gui\viewport.h" />
@@ -355,6 +360,8 @@
 		<Unit filename="src\guild.h" />
 		<Unit filename="src\imageparticle.cpp" />
 		<Unit filename="src\imageparticle.h" />
+		<Unit filename="src\imagesprite.cpp" />
+		<Unit filename="src\imagesprite.h" />
 		<Unit filename="src\inventory.cpp" />
 		<Unit filename="src\inventory.h" />
 		<Unit filename="src\item.cpp" />
@@ -365,6 +372,8 @@
 		<Unit filename="src\joystick.h" />
 		<Unit filename="src\keyboardconfig.cpp" />
 		<Unit filename="src\keyboardconfig.h" />
+		<Unit filename="src\listener.cpp" />
+		<Unit filename="src\listener.h" />
 		<Unit filename="src\localplayer.cpp" />
 		<Unit filename="src\localplayer.h" />
 		<Unit filename="src\log.cpp" />
@@ -376,60 +385,12 @@
 		</Unit>
 		<Unit filename="src\map.cpp" />
 		<Unit filename="src\map.h" />
-		<Unit filename="src\monster.cpp" />
-		<Unit filename="src\monster.h" />
 		<Unit filename="src\net\adminhandler.h" />
 		<Unit filename="src\net\charhandler.cpp" />
 		<Unit filename="src\net\charhandler.h" />
 		<Unit filename="src\net\chathandler.h" />
 		<Unit filename="src\net\download.cpp" />
 		<Unit filename="src\net\download.h" />
-		<Unit filename="src\net\tmwa\adminhandler.cpp" />
-		<Unit filename="src\net\tmwa\adminhandler.h" />
-		<Unit filename="src\net\tmwa\beinghandler.cpp" />
-		<Unit filename="src\net\tmwa\beinghandler.h" />
-		<Unit filename="src\net\tmwa\buysellhandler.cpp" />
-		<Unit filename="src\net\tmwa\buysellhandler.h" />
-		<Unit filename="src\net\tmwa\charserverhandler.cpp" />
-		<Unit filename="src\net\tmwa\charserverhandler.h" />
-		<Unit filename="src\net\tmwa\chathandler.cpp" />
-		<Unit filename="src\net\tmwa\chathandler.h" />
-		<Unit filename="src\net\tmwa\gamehandler.cpp" />
-		<Unit filename="src\net\tmwa\gamehandler.h" />
-		<Unit filename="src\net\tmwa\generalhandler.cpp" />
-		<Unit filename="src\net\tmwa\generalhandler.h" />
-		<Unit filename="src\net\tmwa\gui\guildtab.cpp" />
-		<Unit filename="src\net\tmwa\gui\guildtab.h" />
-		<Unit filename="src\net\tmwa\gui\partytab.cpp" />
-		<Unit filename="src\net\tmwa\gui\partytab.h" />
-		<Unit filename="src\net\tmwa\guildhandler.cpp" />
-		<Unit filename="src\net\tmwa\guildhandler.h" />
-		<Unit filename="src\net\tmwa\inventoryhandler.cpp" />
-		<Unit filename="src\net\tmwa\inventoryhandler.h" />
-		<Unit filename="src\net\tmwa\itemhandler.cpp" />
-		<Unit filename="src\net\tmwa\itemhandler.h" />
-		<Unit filename="src\net\tmwa\loginhandler.cpp" />
-		<Unit filename="src\net\tmwa\loginhandler.h" />
-		<Unit filename="src\net\tmwa\messagehandler.cpp" />
-		<Unit filename="src\net\tmwa\messagehandler.h" />
-		<Unit filename="src\net\tmwa\messagein.cpp" />
-		<Unit filename="src\net\tmwa\messagein.h" />
-		<Unit filename="src\net\tmwa\messageout.cpp" />
-		<Unit filename="src\net\tmwa\messageout.h" />
-		<Unit filename="src\net\tmwa\network.cpp" />
-		<Unit filename="src\net\tmwa\network.h" />
-		<Unit filename="src\net\tmwa\npchandler.cpp" />
-		<Unit filename="src\net\tmwa\npchandler.h" />
-		<Unit filename="src\net\tmwa\partyhandler.cpp" />
-		<Unit filename="src\net\tmwa\partyhandler.h" />
-		<Unit filename="src\net\tmwa\playerhandler.cpp" />
-		<Unit filename="src\net\tmwa\playerhandler.h" />
-		<Unit filename="src\net\tmwa\protocol.h" />
-		<Unit filename="src\net\tmwa\specialhandler.cpp" />
-		<Unit filename="src\net\tmwa\specialhandler.h" />
-		<Unit filename="src\net\tmwa\token.h" />
-		<Unit filename="src\net\tmwa\tradehandler.cpp" />
-		<Unit filename="src\net\tmwa\tradehandler.h" />
 		<Unit filename="src\net\gamehandler.h" />
 		<Unit filename="src\net\generalhandler.h" />
 		<Unit filename="src\net\guildhandler.h" />
@@ -438,6 +399,8 @@
 		<Unit filename="src\net\loginhandler.h" />
 		<Unit filename="src\net\manaserv\adminhandler.cpp" />
 		<Unit filename="src\net\manaserv\adminhandler.h" />
+		<Unit filename="src\net\manaserv\attributes.cpp" />
+		<Unit filename="src\net\manaserv\attributes.h" />
 		<Unit filename="src\net\manaserv\beinghandler.cpp" />
 		<Unit filename="src\net\manaserv\beinghandler.h" />
 		<Unit filename="src\net\manaserv\buysellhandler.cpp" />
@@ -448,6 +411,7 @@
 		<Unit filename="src\net\manaserv\chathandler.h" />
 		<Unit filename="src\net\manaserv\connection.cpp" />
 		<Unit filename="src\net\manaserv\connection.h" />
+		<Unit filename="src\net\manaserv\defines.h" />
 		<Unit filename="src\net\manaserv\effecthandler.cpp" />
 		<Unit filename="src\net\manaserv\effecthandler.h" />
 		<Unit filename="src\net\manaserv\gamehandler.cpp" />
@@ -478,11 +442,9 @@
 		<Unit filename="src\net\manaserv\partyhandler.h" />
 		<Unit filename="src\net\manaserv\playerhandler.cpp" />
 		<Unit filename="src\net\manaserv\playerhandler.h" />
-		<Unit filename="src\net\manaserv\protocol.h" />
+		<Unit filename="src\net\manaserv\manaserv_protocol.h" />
 		<Unit filename="src\net\manaserv\specialhandler.cpp" />
 		<Unit filename="src\net\manaserv\specialhandler.h" />
-		<Unit filename="src\net\manaserv\stats.cpp" />
-		<Unit filename="src\net\manaserv\stats.h" />
 		<Unit filename="src\net\manaserv\tradehandler.cpp" />
 		<Unit filename="src\net\manaserv\tradehandler.h" />
 		<Unit filename="src\net\messagehandler.h" />
@@ -497,10 +459,54 @@
 		<Unit filename="src\net\playerhandler.h" />
 		<Unit filename="src\net\serverinfo.h" />
 		<Unit filename="src\net\specialhandler.h" />
+		<Unit filename="src\net\tmwa\adminhandler.cpp" />
+		<Unit filename="src\net\tmwa\adminhandler.h" />
+		<Unit filename="src\net\tmwa\beinghandler.cpp" />
+		<Unit filename="src\net\tmwa\beinghandler.h" />
+		<Unit filename="src\net\tmwa\buysellhandler.cpp" />
+		<Unit filename="src\net\tmwa\buysellhandler.h" />
+		<Unit filename="src\net\tmwa\charserverhandler.cpp" />
+		<Unit filename="src\net\tmwa\charserverhandler.h" />
+		<Unit filename="src\net\tmwa\chathandler.cpp" />
+		<Unit filename="src\net\tmwa\chathandler.h" />
+		<Unit filename="src\net\tmwa\gamehandler.cpp" />
+		<Unit filename="src\net\tmwa\gamehandler.h" />
+		<Unit filename="src\net\tmwa\generalhandler.cpp" />
+		<Unit filename="src\net\tmwa\generalhandler.h" />
+		<Unit filename="src\net\tmwa\gui\guildtab.cpp" />
+		<Unit filename="src\net\tmwa\gui\guildtab.h" />
+		<Unit filename="src\net\tmwa\gui\partytab.cpp" />
+		<Unit filename="src\net\tmwa\gui\partytab.h" />
+		<Unit filename="src\net\tmwa\guildhandler.cpp" />
+		<Unit filename="src\net\tmwa\guildhandler.h" />
+		<Unit filename="src\net\tmwa\inventoryhandler.cpp" />
+		<Unit filename="src\net\tmwa\inventoryhandler.h" />
+		<Unit filename="src\net\tmwa\itemhandler.cpp" />
+		<Unit filename="src\net\tmwa\itemhandler.h" />
+		<Unit filename="src\net\tmwa\loginhandler.cpp" />
+		<Unit filename="src\net\tmwa\loginhandler.h" />
+		<Unit filename="src\net\tmwa\messagehandler.cpp" />
+		<Unit filename="src\net\tmwa\messagehandler.h" />
+		<Unit filename="src\net\tmwa\messagein.cpp" />
+		<Unit filename="src\net\tmwa\messagein.h" />
+		<Unit filename="src\net\tmwa\messageout.cpp" />
+		<Unit filename="src\net\tmwa\messageout.h" />
+		<Unit filename="src\net\tmwa\network.cpp" />
+		<Unit filename="src\net\tmwa\network.h" />
+		<Unit filename="src\net\tmwa\npchandler.cpp" />
+		<Unit filename="src\net\tmwa\npchandler.h" />
+		<Unit filename="src\net\tmwa\partyhandler.cpp" />
+		<Unit filename="src\net\tmwa\partyhandler.h" />
+		<Unit filename="src\net\tmwa\playerhandler.cpp" />
+		<Unit filename="src\net\tmwa\playerhandler.h" />
+		<Unit filename="src\net\tmwa\protocol.h" />
+		<Unit filename="src\net\tmwa\specialhandler.cpp" />
+		<Unit filename="src\net\tmwa\specialhandler.h" />
+		<Unit filename="src\net\tmwa\token.h" />
+		<Unit filename="src\net\tmwa\tradehandler.cpp" />
+		<Unit filename="src\net\tmwa\tradehandler.h" />
 		<Unit filename="src\net\tradehandler.h" />
 		<Unit filename="src\net\worldinfo.h" />
-		<Unit filename="src\npc.cpp" />
-		<Unit filename="src\npc.h" />
 		<Unit filename="src\openglgraphics.cpp" />
 		<Unit filename="src\openglgraphics.h" />
 		<Unit filename="src\particle.cpp" />
@@ -512,8 +518,8 @@
 		<Unit filename="src\particleemitterprop.h" />
 		<Unit filename="src\party.cpp" />
 		<Unit filename="src\party.h" />
-		<Unit filename="src\player.cpp" />
-		<Unit filename="src\player.h" />
+		<Unit filename="src\playerinfo.cpp" />
+		<Unit filename="src\playerinfo.h" />
 		<Unit filename="src\playerrelations.cpp" />
 		<Unit filename="src\playerrelations.h" />
 		<Unit filename="src\position.cpp" />
@@ -525,6 +531,8 @@
 		<Unit filename="src\resources\ambientlayer.h" />
 		<Unit filename="src\resources\animation.cpp" />
 		<Unit filename="src\resources\animation.h" />
+		<Unit filename="src\resources\beinginfo.cpp" />
+		<Unit filename="src\resources\beinginfo.h" />
 		<Unit filename="src\resources\colordb.cpp" />
 		<Unit filename="src\resources\colordb.h" />
 		<Unit filename="src\resources\dye.cpp" />
@@ -547,8 +555,6 @@
 		<Unit filename="src\resources\mapreader.h" />
 		<Unit filename="src\resources\monsterdb.cpp" />
 		<Unit filename="src\resources\monsterdb.h" />
-		<Unit filename="src\resources\monsterinfo.cpp" />
-		<Unit filename="src\resources\monsterinfo.h" />
 		<Unit filename="src\resources\music.cpp" />
 		<Unit filename="src\resources\music.h" />
 		<Unit filename="src\resources\npcdb.cpp" />
@@ -559,8 +565,14 @@
 		<Unit filename="src\resources\resourcemanager.h" />
 		<Unit filename="src\resources\soundeffect.cpp" />
 		<Unit filename="src\resources\soundeffect.h" />
+		<Unit filename="src\resources\specialdb.cpp" />
+		<Unit filename="src\resources\specialdb.h" />
 		<Unit filename="src\resources\spritedef.cpp" />
 		<Unit filename="src\resources\spritedef.h" />
+		<Unit filename="src\resources\theme.cpp" />
+		<Unit filename="src\resources\theme.h" />
+		<Unit filename="src\resources\userpalette.cpp" />
+		<Unit filename="src\resources\userpalette.h" />
 		<Unit filename="src\resources\wallpaper.cpp" />
 		<Unit filename="src\resources\wallpaper.h" />
 		<Unit filename="src\rotationalparticle.cpp" />
@@ -604,6 +616,7 @@
 		<Unit filename="src\utils\xml.h" />
 		<Unit filename="src\utils\zlib.cpp" />
 		<Unit filename="src\utils\zlib.h" />
+		<Unit filename="src\variabledata.h" />
 		<Unit filename="src\vector.cpp" />
 		<Unit filename="src\vector.h" />
 		<Unit filename="src\winver.h" />
diff --git a/mana.files b/mana.files
index ca1f4faf..13aef208 100644
--- a/mana.files
+++ b/mana.files
@@ -1,556 +1,569 @@
-./CMakeLists.txt
-./data/CMakeLists.txt
-./data/fonts/CMakeLists.txt
-./data/graphics/CMakeLists.txt
-./data/graphics/gui/CMakeLists.txt
-./data/graphics/gui/colors.xml
-./data/graphics/gui/speechbubble.xml
-./data/graphics/gui/window.xml
-./data/graphics/images/CMakeLists.txt
-./data/graphics/sprites/CMakeLists.txt
-./data/graphics/sprites/error.xml
-./data/help/about.txt
-./data/help/changes.txt
-./data/help/CMakeLists.txt
-./data/help/commands.txt
-./data/help/header.txt
-./data/help/index.txt
-./data/help/support.txt
-./data/help/windows.txt
-./data/icons/CMakeLists.txt
-./docs/clientupdates.txt
-./docs/example.mana
-./docs/FAQ.txt
-./docs/HACKING.txt
-./docs/items.txt
-./docs/packages.txt
-./docs/progression.txt
-./docs/sounddev.txt
-./libs/enet/CMakeLists.txt
-./libs/enet/design.txt
-./libs/enet/include/enet/callbacks.h
-./libs/enet/include/enet/enet.h
-./libs/enet/include/enet/list.h
-./libs/enet/include/enet/protocol.h
-./libs/enet/include/enet/time.h
-./libs/enet/include/enet/types.h
-./libs/enet/include/enet/unix.h
-./libs/enet/include/enet/utility.h
-./libs/enet/include/enet/win32.h
-./packaging/windows/portable.xml
-./packaging/windows/readme.txt
-./po/CMakeLists.txt
-./src/animatedsprite.cpp
-./src/animatedsprite.h
-./src/animationparticle.cpp
-./src/animationparticle.h
-./src/avatar.cpp
-./src/avatar.h
-./src/being.cpp
-./src/being.h
-./src/beingmanager.cpp
-./src/beingmanager.h
-./src/channel.cpp
-./src/channel.h
-./src/channelmanager.cpp
-./src/channelmanager.h
-./src/client.cpp
-./src/client.h
-./src/CMakeLists.txt
-./src/commandhandler.cpp
-./src/commandhandler.h
-./src/configlistener.h
-./src/configuration.cpp
-./src/configuration.h
-./src/effectmanager.cpp
-./src/effectmanager.h
-./src/emoteshortcut.cpp
-./src/emoteshortcut.h
-./src/equipment.h
-./src/flooritem.cpp
-./src/flooritem.h
-./src/flooritemmanager.cpp
-./src/flooritemmanager.h
-./src/game.cpp
-./src/game.h
-./src/graphics.cpp
-./src/graphics.h
-./src/gui/beingpopup.cpp
-./src/gui/beingpopup.h
-./src/gui/buy.cpp
-./src/gui/buy.h
-./src/gui/buysell.cpp
-./src/gui/buysell.h
-./src/guichanfwd.h
-./src/gui/changeemaildialog.cpp
-./src/gui/changeemaildialog.h
-./src/gui/changepassworddialog.cpp
-./src/gui/changepassworddialog.h
-./src/gui/charcreatedialog.cpp
-./src/gui/charcreatedialog.h
-./src/gui/charselectdialog.cpp
-./src/gui/charselectdialog.h
-./src/gui/chat.cpp
-./src/gui/chat.h
-./src/gui/confirmdialog.cpp
-./src/gui/confirmdialog.h
-./src/gui/connectiondialog.cpp
-./src/gui/connectiondialog.h
-./src/gui/debugwindow.cpp
-./src/gui/debugwindow.h
-./src/gui/emotepopup.cpp
-./src/gui/emotepopup.h
-./src/gui/equipmentwindow.cpp
-./src/gui/equipmentwindow.h
-./src/gui/focushandler.cpp
-./src/gui/focushandler.h
-./src/gui/gui.cpp
-./src/gui/gui.h
-./src/gui/help.cpp
-./src/gui/help.h
-./src/gui/inventorywindow.cpp
-./src/gui/inventorywindow.h
-./src/gui/itemamount.cpp
-./src/gui/itemamount.h
-./src/gui/itempopup.cpp
-./src/gui/itempopup.h
-./src/guild.cpp
-./src/guild.h
-./src/gui/login.cpp
-./src/gui/login.h
-./src/gui/minimap.cpp
-./src/gui/minimap.h
-./src/gui/ministatus.cpp
-./src/gui/ministatus.h
-./src/gui/npcdialog.cpp
-./src/gui/npcdialog.h
-./src/gui/npcpostdialog.cpp
-./src/gui/npcpostdialog.h
-./src/gui/okdialog.cpp
-./src/gui/okdialog.h
-./src/gui/outfitwindow.cpp
-./src/gui/outfitwindow.h
-./src/gui/palette.cpp
-./src/gui/palette.h
-./src/gui/popupmenu.cpp
-./src/gui/popupmenu.h
-./src/gui/quitdialog.cpp
-./src/gui/quitdialog.h
-./src/gui/recorder.cpp
-./src/gui/recorder.h
-./src/gui/register.cpp
-./src/gui/register.h
-./src/gui/sdlinput.cpp
-./src/gui/sdlinput.h
-./src/gui/sell.cpp
-./src/gui/sell.h
-./src/gui/serverdialog.cpp
-./src/gui/serverdialog.h
-./src/gui/setup_audio.cpp
-./src/gui/setup_audio.h
-./src/gui/setup_colors.cpp
-./src/gui/setup_colors.h
-./src/gui/setup.cpp
-./src/gui/setup.h
-./src/gui/setup_joystick.cpp
-./src/gui/setup_joystick.h
-./src/gui/setup_keyboard.cpp
-./src/gui/setup_keyboard.h
-./src/gui/setup_players.cpp
-./src/gui/setup_players.h
-./src/gui/setup_video.cpp
-./src/gui/setup_video.h
-./src/gui/shortcutwindow.cpp
-./src/gui/shortcutwindow.h
-./src/gui/skilldialog.cpp
-./src/gui/skilldialog.h
-./src/gui/socialwindow.cpp
-./src/gui/socialwindow.h
-./src/gui/specialswindow.cpp
-./src/gui/specialswindow.h
-./src/gui/speechbubble.cpp
-./src/gui/speechbubble.h
-./src/gui/statuswindow.cpp
-./src/gui/statuswindow.h
-./src/gui/textdialog.cpp
-./src/gui/textdialog.h
-./src/gui/textpopup.cpp
-./src/gui/textpopup.h
-./src/gui/theme.cpp
-./src/gui/theme.h
-./src/gui/trade.cpp
-./src/gui/trade.h
-./src/gui/truetypefont.cpp
-./src/gui/truetypefont.h
-./src/gui/unregisterdialog.cpp
-./src/gui/unregisterdialog.h
-./src/gui/updatewindow.cpp
-./src/gui/updatewindow.h
-./src/gui/userpalette.cpp
-./src/gui/userpalette.h
-./src/gui/viewport.cpp
-./src/gui/viewport.h
-./src/gui/widgets/avatarlistbox.cpp
-./src/gui/widgets/avatarlistbox.h
-./src/gui/widgets/browserbox.cpp
-./src/gui/widgets/browserbox.h
-./src/gui/widgets/button.cpp
-./src/gui/widgets/button.h
-./src/gui/widgets/channeltab.cpp
-./src/gui/widgets/channeltab.h
-./src/gui/widgets/chattab.cpp
-./src/gui/widgets/chattab.h
-./src/gui/widgets/checkbox.cpp
-./src/gui/widgets/checkbox.h
-./src/gui/widgets/container.cpp
-./src/gui/widgets/container.h
-./src/gui/widgets/desktop.cpp
-./src/gui/widgets/desktop.h
-./src/gui/widgets/dropdown.cpp
-./src/gui/widgets/dropdown.h
-./src/gui/widgets/emoteshortcutcontainer.cpp
-./src/gui/widgets/emoteshortcutcontainer.h
-./src/gui/widgets/flowcontainer.cpp
-./src/gui/widgets/flowcontainer.h
-./src/gui/widgets/icon.cpp
-./src/gui/widgets/icon.h
-./src/gui/widgets/inttextfield.cpp
-./src/gui/widgets/inttextfield.h
-./src/gui/widgets/itemcontainer.cpp
-./src/gui/widgets/itemcontainer.h
-./src/gui/widgets/itemlinkhandler.cpp
-./src/gui/widgets/itemlinkhandler.h
-./src/gui/widgets/itemshortcutcontainer.cpp
-./src/gui/widgets/itemshortcutcontainer.h
-./src/gui/widgets/label.cpp
-./src/gui/widgets/label.h
-./src/gui/widgets/layout.cpp
-./src/gui/widgets/layout.h
-./src/gui/widgets/layouthelper.cpp
-./src/gui/widgets/layouthelper.h
-./src/gui/widgets/linkhandler.h
-./src/gui/widgets/listbox.cpp
-./src/gui/widgets/listbox.h
-./src/gui/widgets/passwordfield.cpp
-./src/gui/widgets/passwordfield.h
-./src/gui/widgets/playerbox.cpp
-./src/gui/widgets/playerbox.h
-./src/gui/widgets/popup.cpp
-./src/gui/widgets/popup.h
-./src/gui/widgets/progressbar.cpp
-./src/gui/widgets/progressbar.h
-./src/gui/widgets/progressindicator.cpp
-./src/gui/widgets/progressindicator.h
-./src/gui/widgets/radiobutton.cpp
-./src/gui/widgets/radiobutton.h
-./src/gui/widgets/resizegrip.cpp
-./src/gui/widgets/resizegrip.h
-./src/gui/widgets/scrollarea.cpp
-./src/gui/widgets/scrollarea.h
-./src/gui/widgets/setuptab.cpp
-./src/gui/widgets/setuptab.h
-./src/gui/widgets/shopitems.cpp
-./src/gui/widgets/shopitems.h
-./src/gui/widgets/shoplistbox.cpp
-./src/gui/widgets/shoplistbox.h
-./src/gui/widgets/shortcutcontainer.cpp
-./src/gui/widgets/shortcutcontainer.h
-./src/gui/widgets/slider.cpp
-./src/gui/widgets/slider.h
-./src/gui/widgets/tabbedarea.cpp
-./src/gui/widgets/tabbedarea.h
-./src/gui/widgets/tab.cpp
-./src/gui/widgets/tab.h
-./src/gui/widgets/table.cpp
-./src/gui/widgets/table.h
-./src/gui/widgets/tablemodel.cpp
-./src/gui/widgets/tablemodel.h
-./src/gui/widgets/textbox.cpp
-./src/gui/widgets/textbox.h
-./src/gui/widgets/textfield.cpp
-./src/gui/widgets/textfield.h
-./src/gui/widgets/textpreview.cpp
-./src/gui/widgets/textpreview.h
-./src/gui/widgets/vertcontainer.cpp
-./src/gui/widgets/vertcontainer.h
-./src/gui/widgets/whispertab.cpp
-./src/gui/widgets/whispertab.h
-./src/gui/widgets/windowcontainer.cpp
-./src/gui/widgets/windowcontainer.h
-./src/gui/widgets/window.cpp
-./src/gui/widgets/window.h
-./src/gui/windowmenu.cpp
-./src/gui/windowmenu.h
-./src/gui/worldselectdialog.cpp
-./src/gui/worldselectdialog.h
-./src/imageparticle.cpp
-./src/imageparticle.h
-./src/inventory.cpp
-./src/inventory.h
-./src/item.cpp
-./src/item.h
-./src/itemshortcut.cpp
-./src/itemshortcut.h
-./src/joystick.cpp
-./src/joystick.h
-./src/keyboardconfig.cpp
-./src/keyboardconfig.h
-./src/localplayer.cpp
-./src/localplayer.h
-./src/log.cpp
-./src/log.h
-./src/main.cpp
-./src/main.h
-./src/map.cpp
-./src/map.h
-./src/monster.cpp
-./src/monster.h
-./src/net/adminhandler.h
-./src/net/charhandler.cpp
-./src/net/charhandler.h
-./src/net/chathandler.h
-./src/net/download.cpp
-./src/net/download.h
-./src/net/gamehandler.h
-./src/net/generalhandler.h
-./src/net/guildhandler.h
-./src/net/inventoryhandler.h
-./src/net/logindata.h
-./src/net/loginhandler.h
-./src/net/manaserv/adminhandler.cpp
-./src/net/manaserv/adminhandler.h
-./src/net/manaserv/beinghandler.cpp
-./src/net/manaserv/beinghandler.h
-./src/net/manaserv/buysellhandler.cpp
-./src/net/manaserv/buysellhandler.h
-./src/net/manaserv/charhandler.cpp
-./src/net/manaserv/charhandler.h
-./src/net/manaserv/chathandler.cpp
-./src/net/manaserv/chathandler.h
-./src/net/manaserv/connection.cpp
-./src/net/manaserv/connection.h
-./src/net/manaserv/effecthandler.cpp
-./src/net/manaserv/effecthandler.h
-./src/net/manaserv/gamehandler.cpp
-./src/net/manaserv/gamehandler.h
-./src/net/manaserv/generalhandler.cpp
-./src/net/manaserv/generalhandler.h
-./src/net/manaserv/guildhandler.cpp
-./src/net/manaserv/guildhandler.h
-./src/net/manaserv/internal.cpp
-./src/net/manaserv/internal.h
-./src/net/manaserv/inventoryhandler.cpp
-./src/net/manaserv/inventoryhandler.h
-./src/net/manaserv/itemhandler.cpp
-./src/net/manaserv/itemhandler.h
-./src/net/manaserv/loginhandler.cpp
-./src/net/manaserv/loginhandler.h
-./src/net/manaserv/messagehandler.cpp
-./src/net/manaserv/messagehandler.h
-./src/net/manaserv/messagein.cpp
-./src/net/manaserv/messagein.h
-./src/net/manaserv/messageout.cpp
-./src/net/manaserv/messageout.h
-./src/net/manaserv/network.cpp
-./src/net/manaserv/network.h
-./src/net/manaserv/npchandler.cpp
-./src/net/manaserv/npchandler.h
-./src/net/manaserv/partyhandler.cpp
-./src/net/manaserv/partyhandler.h
-./src/net/manaserv/playerhandler.cpp
-./src/net/manaserv/playerhandler.h
-./src/net/manaserv/protocol.h
-./src/net/manaserv/specialhandler.cpp
-./src/net/manaserv/specialhandler.h
-./src/net/manaserv/stats.cpp
-./src/net/manaserv/stats.h
-./src/net/manaserv/tradehandler.cpp
-./src/net/manaserv/tradehandler.h
-./src/net/messagehandler.h
-./src/net/messagein.cpp
-./src/net/messagein.h
-./src/net/messageout.cpp
-./src/net/messageout.h
-./src/net/net.cpp
-./src/net/net.h
-./src/net/npchandler.h
-./src/net/partyhandler.h
-./src/net/playerhandler.h
-./src/net/serverinfo.h
-./src/net/specialhandler.h
-./src/net/tmwa/adminhandler.cpp
-./src/net/tmwa/adminhandler.h
-./src/net/tmwa/beinghandler.cpp
-./src/net/tmwa/beinghandler.h
-./src/net/tmwa/buysellhandler.cpp
-./src/net/tmwa/buysellhandler.h
-./src/net/tmwa/charserverhandler.cpp
-./src/net/tmwa/charserverhandler.h
-./src/net/tmwa/chathandler.cpp
-./src/net/tmwa/chathandler.h
-./src/net/tmwa/gamehandler.cpp
-./src/net/tmwa/gamehandler.h
-./src/net/tmwa/generalhandler.cpp
-./src/net/tmwa/generalhandler.h
-./src/net/tmwa/gui/guildtab.cpp
-./src/net/tmwa/gui/guildtab.h
-./src/net/tmwa/guildhandler.cpp
-./src/net/tmwa/guildhandler.h
-./src/net/tmwa/gui/partytab.cpp
-./src/net/tmwa/gui/partytab.h
-./src/net/tmwa/inventoryhandler.cpp
-./src/net/tmwa/inventoryhandler.h
-./src/net/tmwa/itemhandler.cpp
-./src/net/tmwa/itemhandler.h
-./src/net/tmwa/loginhandler.cpp
-./src/net/tmwa/loginhandler.h
-./src/net/tmwa/messagehandler.cpp
-./src/net/tmwa/messagehandler.h
-./src/net/tmwa/messagein.cpp
-./src/net/tmwa/messagein.h
-./src/net/tmwa/messageout.cpp
-./src/net/tmwa/messageout.h
-./src/net/tmwa/network.cpp
-./src/net/tmwa/network.h
-./src/net/tmwa/npchandler.cpp
-./src/net/tmwa/npchandler.h
-./src/net/tmwa/partyhandler.cpp
-./src/net/tmwa/partyhandler.h
-./src/net/tmwa/playerhandler.cpp
-./src/net/tmwa/playerhandler.h
-./src/net/tmwa/protocol.h
-./src/net/tmwa/specialhandler.cpp
-./src/net/tmwa/specialhandler.h
-./src/net/tmwa/token.h
-./src/net/tmwa/tradehandler.cpp
-./src/net/tmwa/tradehandler.h
-./src/net/tradehandler.h
-./src/net/worldinfo.h
-./src/npc.cpp
-./src/npc.h
-./src/openglgraphics.cpp
-./src/openglgraphics.h
-./src/particlecontainer.cpp
-./src/particlecontainer.h
-./src/particle.cpp
-./src/particleemitter.cpp
-./src/particleemitter.h
-./src/particleemitterprop.h
-./src/particle.h
-./src/party.cpp
-./src/party.h
-./src/player.cpp
-./src/player.h
-./src/playerrelations.cpp
-./src/playerrelations.h
-./src/position.cpp
-./src/position.h
-./src/properties.h
-./src/resources/action.cpp
-./src/resources/action.h
-./src/resources/ambientlayer.cpp
-./src/resources/ambientlayer.h
-./src/resources/animation.cpp
-./src/resources/animation.h
-./src/resources/colordb.cpp
-./src/resources/colordb.h
-./src/resources/dye.cpp
-./src/resources/dye.h
-./src/resources/emotedb.cpp
-./src/resources/emotedb.h
-./src/resources/image.cpp
-./src/resources/image.h
-./src/resources/imageloader.cpp
-./src/resources/imageloader.h
-./src/resources/imageset.cpp
-./src/resources/imageset.h
-./src/resources/imagewriter.cpp
-./src/resources/imagewriter.h
-./src/resources/itemdb.cpp
-./src/resources/itemdb.h
-./src/resources/iteminfo.cpp
-./src/resources/iteminfo.h
-./src/resources/mapreader.cpp
-./src/resources/mapreader.h
-./src/resources/monsterdb.cpp
-./src/resources/monsterdb.h
-./src/resources/monsterinfo.cpp
-./src/resources/monsterinfo.h
-./src/resources/music.cpp
-./src/resources/music.h
-./src/resources/npcdb.cpp
-./src/resources/npcdb.h
-./src/resources/resource.cpp
-./src/resources/resource.h
-./src/resources/resourcemanager.cpp
-./src/resources/resourcemanager.h
-./src/resources/soundeffect.cpp
-./src/resources/soundeffect.h
-./src/resources/spritedef.cpp
-./src/resources/spritedef.h
-./src/resources/wallpaper.cpp
-./src/resources/wallpaper.h
-./src/rotationalparticle.cpp
-./src/rotationalparticle.h
-./src/SDLMain.h
-./src/shopitem.cpp
-./src/shopitem.h
-./src/simpleanimation.cpp
-./src/simpleanimation.h
-./src/sound.cpp
-./src/sound.h
-./src/sprite.h
-./src/statuseffect.cpp
-./src/statuseffect.h
-./src/text.cpp
-./src/text.h
-./src/textmanager.cpp
-./src/textmanager.h
-./src/textparticle.cpp
-./src/textparticle.h
-./src/textrenderer.h
-./src/tileset.h
-./src/units.cpp
-./src/units.h
-./src/utils/base64.cpp
-./src/utils/base64.h
-./src/utils/copynpaste.cpp
-./src/utils/copynpaste.h
-./src/utils/dtor.h
-./src/utils/gettext.h
-./src/utils/mathutils.h
-./src/utils/mkdir.cpp
-./src/utils/mkdir.h
-./src/utils/mutex.h
-./src/utils/sha256.cpp
-./src/utils/sha256.h
-./src/utils/specialfolder.cpp
-./src/utils/specialfolder.h
-./src/utils/stringutils.cpp
-./src/utils/stringutils.h
-./src/utils/xml.cpp
-./src/utils/xml.h
-./src/utils/zlib.cpp
-./src/utils/zlib.h
-./src/vector.cpp
-./src/vector.h
-./src/winver.h
-./tools/dyecmd/CMakeLists.txt
-./tools/dyecmd/src/CMakeLists.txt
-./tools/dyecmd/src/dyecmd.cpp
-./tools/dyecmd/src/dye.cpp
-./tools/dyecmd/src/dye.h
-./tools/dyecmd/src/imagewriter.cpp
-./tools/dyecmd/src/imagewriter.h
-./tools/tmxcopy/base64.cpp
-./tools/tmxcopy/base64.h
-./tools/tmxcopy/map.cpp
-./tools/tmxcopy/readme.txt
-./tools/tmxcopy/tmxcollide.cpp
-./tools/tmxcopy/tmxcopy.cpp
-./tools/tmxcopy/tmx_random_fill.cpp
-./tools/tmxcopy/tostring.h
-./tools/tmxcopy/xmlutils.cpp
-./tools/tmxcopy/xmlutils.h
-./tools/tmxcopy/zlibutils.cpp
-./tools/tmxcopy/zlibutils.h
+CMakeLists.txt
+data/CMakeLists.txt
+data/fonts/CMakeLists.txt
+data/graphics/CMakeLists.txt
+data/graphics/gui/CMakeLists.txt
+data/graphics/gui/colors.xml
+data/graphics/gui/speechbubble.xml
+data/graphics/gui/window.xml
+data/graphics/images/CMakeLists.txt
+data/graphics/sprites/CMakeLists.txt
+data/graphics/sprites/error.xml
+data/help/CMakeLists.txt
+data/help/about.txt
+data/help/changes.txt
+data/help/commands.txt
+data/help/header.txt
+data/help/index.txt
+data/help/support.txt
+data/help/windows.txt
+data/icons/CMakeLists.txt
+docs/FAQ.txt
+docs/HACKING.txt
+docs/clientupdates.txt
+docs/example.mana
+docs/items.txt
+docs/packages.txt
+docs/progression.txt
+docs/sounddev.txt
+libs/enet/CMakeLists.txt
+libs/enet/design.txt
+libs/enet/include/enet/callbacks.h
+libs/enet/include/enet/enet.h
+libs/enet/include/enet/list.h
+libs/enet/include/enet/protocol.h
+libs/enet/include/enet/time.h
+libs/enet/include/enet/types.h
+libs/enet/include/enet/unix.h
+libs/enet/include/enet/utility.h
+libs/enet/include/enet/win32.h
+packaging/windows/portable.xml
+packaging/windows/readme.txt
+po/CMakeLists.txt
+src/CMakeLists.txt
+src/SDLMain.h
+src/actor.cpp
+src/actor.h
+src/actorsprite.cpp
+src/actorsprite.h
+src/actorspritemanager.cpp
+src/actorspritemanager.h
+src/animatedsprite.cpp
+src/animatedsprite.h
+src/animationparticle.cpp
+src/animationparticle.h
+src/avatar.cpp
+src/avatar.h
+src/being.cpp
+src/being.h
+src/channel.cpp
+src/channel.h
+src/channelmanager.cpp
+src/channelmanager.h
+src/chatlog.cpp
+src/chatlog.h
+src/client.cpp
+src/client.h
+src/commandhandler.cpp
+src/commandhandler.h
+src/compoundsprite.cpp
+src/compoundsprite.h
+src/configuration.cpp
+src/configuration.h
+src/defaults.cpp
+src/defaults.h
+src/effectmanager.cpp
+src/effectmanager.h
+src/emoteshortcut.cpp
+src/emoteshortcut.h
+src/equipment.h
+src/event.cpp
+src/event.h
+src/flooritem.cpp
+src/flooritem.h
+src/game.cpp
+src/game.h
+src/graphics.cpp
+src/graphics.h
+src/gui/beingpopup.cpp
+src/gui/beingpopup.h
+src/gui/buy.cpp
+src/gui/buy.h
+src/gui/buysell.cpp
+src/gui/buysell.h
+src/gui/changeemaildialog.cpp
+src/gui/changeemaildialog.h
+src/gui/changepassworddialog.cpp
+src/gui/changepassworddialog.h
+src/gui/charcreatedialog.cpp
+src/gui/charcreatedialog.h
+src/gui/charselectdialog.cpp
+src/gui/charselectdialog.h
+src/gui/chat.cpp
+src/gui/chat.h
+src/gui/confirmdialog.cpp
+src/gui/confirmdialog.h
+src/gui/connectiondialog.cpp
+src/gui/connectiondialog.h
+src/gui/debugwindow.cpp
+src/gui/debugwindow.h
+src/gui/emotepopup.cpp
+src/gui/emotepopup.h
+src/gui/equipmentwindow.cpp
+src/gui/equipmentwindow.h
+src/gui/focushandler.cpp
+src/gui/focushandler.h
+src/gui/gui.cpp
+src/gui/gui.h
+src/gui/help.cpp
+src/gui/help.h
+src/gui/inventorywindow.cpp
+src/gui/inventorywindow.h
+src/gui/itemamount.cpp
+src/gui/itemamount.h
+src/gui/itempopup.cpp
+src/gui/itempopup.h
+src/gui/login.cpp
+src/gui/login.h
+src/gui/minimap.cpp
+src/gui/minimap.h
+src/gui/ministatus.cpp
+src/gui/ministatus.h
+src/gui/npcdialog.cpp
+src/gui/npcdialog.h
+src/gui/npcpostdialog.cpp
+src/gui/npcpostdialog.h
+src/gui/okdialog.cpp
+src/gui/okdialog.h
+src/gui/outfitwindow.cpp
+src/gui/outfitwindow.h
+src/gui/palette.cpp
+src/gui/palette.h
+src/gui/popupmenu.cpp
+src/gui/popupmenu.h
+src/gui/quitdialog.cpp
+src/gui/quitdialog.h
+src/gui/recorder.cpp
+src/gui/recorder.h
+src/gui/register.cpp
+src/gui/register.h
+src/gui/sdlinput.cpp
+src/gui/sdlinput.h
+src/gui/sell.cpp
+src/gui/sell.h
+src/gui/serverdialog.cpp
+src/gui/serverdialog.h
+src/gui/setup.cpp
+src/gui/setup.h
+src/gui/setup_audio.cpp
+src/gui/setup_audio.h
+src/gui/setup_colors.cpp
+src/gui/setup_colors.h
+src/gui/setup_joystick.cpp
+src/gui/setup_joystick.h
+src/gui/setup_keyboard.cpp
+src/gui/setup_keyboard.h
+src/gui/setup_players.cpp
+src/gui/setup_players.h
+src/gui/setup_video.cpp
+src/gui/setup_video.h
+src/gui/shortcutwindow.cpp
+src/gui/shortcutwindow.h
+src/gui/skilldialog.cpp
+src/gui/skilldialog.h
+src/gui/socialwindow.cpp
+src/gui/socialwindow.h
+src/gui/specialswindow.cpp
+src/gui/specialswindow.h
+src/gui/speechbubble.cpp
+src/gui/speechbubble.h
+src/gui/statuswindow.cpp
+src/gui/statuswindow.h
+src/gui/textdialog.cpp
+src/gui/textdialog.h
+src/gui/textpopup.cpp
+src/gui/textpopup.h
+src/gui/trade.cpp
+src/gui/trade.h
+src/gui/truetypefont.cpp
+src/gui/truetypefont.h
+src/gui/unregisterdialog.cpp
+src/gui/unregisterdialog.h
+src/gui/updatewindow.cpp
+src/gui/updatewindow.h
+src/gui/viewport.cpp
+src/gui/viewport.h
+src/gui/widgets/avatarlistbox.cpp
+src/gui/widgets/avatarlistbox.h
+src/gui/widgets/browserbox.cpp
+src/gui/widgets/browserbox.h
+src/gui/widgets/button.cpp
+src/gui/widgets/button.h
+src/gui/widgets/channeltab.cpp
+src/gui/widgets/channeltab.h
+src/gui/widgets/chattab.cpp
+src/gui/widgets/chattab.h
+src/gui/widgets/checkbox.cpp
+src/gui/widgets/checkbox.h
+src/gui/widgets/container.cpp
+src/gui/widgets/container.h
+src/gui/widgets/desktop.cpp
+src/gui/widgets/desktop.h
+src/gui/widgets/dropdown.cpp
+src/gui/widgets/dropdown.h
+src/gui/widgets/emoteshortcutcontainer.cpp
+src/gui/widgets/emoteshortcutcontainer.h
+src/gui/widgets/flowcontainer.cpp
+src/gui/widgets/flowcontainer.h
+src/gui/widgets/icon.cpp
+src/gui/widgets/icon.h
+src/gui/widgets/inttextfield.cpp
+src/gui/widgets/inttextfield.h
+src/gui/widgets/itemcontainer.cpp
+src/gui/widgets/itemcontainer.h
+src/gui/widgets/itemlinkhandler.cpp
+src/gui/widgets/itemlinkhandler.h
+src/gui/widgets/itemshortcutcontainer.cpp
+src/gui/widgets/itemshortcutcontainer.h
+src/gui/widgets/label.cpp
+src/gui/widgets/label.h
+src/gui/widgets/layout.cpp
+src/gui/widgets/layout.h
+src/gui/widgets/layouthelper.cpp
+src/gui/widgets/layouthelper.h
+src/gui/widgets/linkhandler.h
+src/gui/widgets/listbox.cpp
+src/gui/widgets/listbox.h
+src/gui/widgets/passwordfield.cpp
+src/gui/widgets/passwordfield.h
+src/gui/widgets/playerbox.cpp
+src/gui/widgets/playerbox.h
+src/gui/widgets/popup.cpp
+src/gui/widgets/popup.h
+src/gui/widgets/progressbar.cpp
+src/gui/widgets/progressbar.h
+src/gui/widgets/progressindicator.cpp
+src/gui/widgets/progressindicator.h
+src/gui/widgets/radiobutton.cpp
+src/gui/widgets/radiobutton.h
+src/gui/widgets/resizegrip.cpp
+src/gui/widgets/resizegrip.h
+src/gui/widgets/scrollarea.cpp
+src/gui/widgets/scrollarea.h
+src/gui/widgets/setuptab.cpp
+src/gui/widgets/setuptab.h
+src/gui/widgets/shopitems.cpp
+src/gui/widgets/shopitems.h
+src/gui/widgets/shoplistbox.cpp
+src/gui/widgets/shoplistbox.h
+src/gui/widgets/shortcutcontainer.cpp
+src/gui/widgets/shortcutcontainer.h
+src/gui/widgets/slider.cpp
+src/gui/widgets/slider.h
+src/gui/widgets/tab.cpp
+src/gui/widgets/tab.h
+src/gui/widgets/tabbedarea.cpp
+src/gui/widgets/tabbedarea.h
+src/gui/widgets/table.cpp
+src/gui/widgets/table.h
+src/gui/widgets/tablemodel.cpp
+src/gui/widgets/tablemodel.h
+src/gui/widgets/textbox.cpp
+src/gui/widgets/textbox.h
+src/gui/widgets/textfield.cpp
+src/gui/widgets/textfield.h
+src/gui/widgets/textpreview.cpp
+src/gui/widgets/textpreview.h
+src/gui/widgets/vertcontainer.cpp
+src/gui/widgets/vertcontainer.h
+src/gui/widgets/whispertab.cpp
+src/gui/widgets/whispertab.h
+src/gui/widgets/window.cpp
+src/gui/widgets/window.h
+src/gui/widgets/windowcontainer.cpp
+src/gui/widgets/windowcontainer.h
+src/gui/windowmenu.cpp
+src/gui/windowmenu.h
+src/gui/worldselectdialog.cpp
+src/gui/worldselectdialog.h
+src/guichanfwd.h
+src/guild.cpp
+src/guild.h
+src/imageparticle.cpp
+src/imageparticle.h
+src/imagesprite.cpp
+src/imagesprite.h
+src/inventory.cpp
+src/inventory.h
+src/item.cpp
+src/item.h
+src/itemshortcut.cpp
+src/itemshortcut.h
+src/joystick.cpp
+src/joystick.h
+src/keyboardconfig.cpp
+src/keyboardconfig.h
+src/listener.cpp
+src/listener.h
+src/localplayer.cpp
+src/localplayer.h
+src/log.cpp
+src/log.h
+src/main.cpp
+src/main.h
+src/map.cpp
+src/map.h
+src/net/adminhandler.h
+src/net/charhandler.cpp
+src/net/charhandler.h
+src/net/chathandler.h
+src/net/download.cpp
+src/net/download.h
+src/net/gamehandler.h
+src/net/generalhandler.h
+src/net/guildhandler.h
+src/net/inventoryhandler.h
+src/net/logindata.h
+src/net/loginhandler.h
+src/net/manaserv/adminhandler.cpp
+src/net/manaserv/adminhandler.h
+src/net/manaserv/attributes.cpp
+src/net/manaserv/attributes.h
+src/net/manaserv/beinghandler.cpp
+src/net/manaserv/beinghandler.h
+src/net/manaserv/buysellhandler.cpp
+src/net/manaserv/buysellhandler.h
+src/net/manaserv/charhandler.cpp
+src/net/manaserv/charhandler.h
+src/net/manaserv/chathandler.cpp
+src/net/manaserv/chathandler.h
+src/net/manaserv/connection.cpp
+src/net/manaserv/connection.h
+src/net/manaserv/defines.h
+src/net/manaserv/effecthandler.cpp
+src/net/manaserv/effecthandler.h
+src/net/manaserv/gamehandler.cpp
+src/net/manaserv/gamehandler.h
+src/net/manaserv/generalhandler.cpp
+src/net/manaserv/generalhandler.h
+src/net/manaserv/guildhandler.cpp
+src/net/manaserv/guildhandler.h
+src/net/manaserv/internal.cpp
+src/net/manaserv/internal.h
+src/net/manaserv/inventoryhandler.cpp
+src/net/manaserv/inventoryhandler.h
+src/net/manaserv/itemhandler.cpp
+src/net/manaserv/itemhandler.h
+src/net/manaserv/loginhandler.cpp
+src/net/manaserv/loginhandler.h
+src/net/manaserv/manaserv_protocol.h
+src/net/manaserv/messagehandler.cpp
+src/net/manaserv/messagehandler.h
+src/net/manaserv/messagein.cpp
+src/net/manaserv/messagein.h
+src/net/manaserv/messageout.cpp
+src/net/manaserv/messageout.h
+src/net/manaserv/network.cpp
+src/net/manaserv/network.h
+src/net/manaserv/npchandler.cpp
+src/net/manaserv/npchandler.h
+src/net/manaserv/partyhandler.cpp
+src/net/manaserv/partyhandler.h
+src/net/manaserv/playerhandler.cpp
+src/net/manaserv/playerhandler.h
+src/net/manaserv/specialhandler.cpp
+src/net/manaserv/specialhandler.h
+src/net/manaserv/tradehandler.cpp
+src/net/manaserv/tradehandler.h
+src/net/messagehandler.h
+src/net/messagein.cpp
+src/net/messagein.h
+src/net/messageout.cpp
+src/net/messageout.h
+src/net/net.cpp
+src/net/net.h
+src/net/npchandler.h
+src/net/partyhandler.h
+src/net/playerhandler.h
+src/net/serverinfo.h
+src/net/specialhandler.h
+src/net/tmwa/adminhandler.cpp
+src/net/tmwa/adminhandler.h
+src/net/tmwa/beinghandler.cpp
+src/net/tmwa/beinghandler.h
+src/net/tmwa/buysellhandler.cpp
+src/net/tmwa/buysellhandler.h
+src/net/tmwa/charserverhandler.cpp
+src/net/tmwa/charserverhandler.h
+src/net/tmwa/chathandler.cpp
+src/net/tmwa/chathandler.h
+src/net/tmwa/gamehandler.cpp
+src/net/tmwa/gamehandler.h
+src/net/tmwa/generalhandler.cpp
+src/net/tmwa/generalhandler.h
+src/net/tmwa/gui/guildtab.cpp
+src/net/tmwa/gui/guildtab.h
+src/net/tmwa/gui/partytab.cpp
+src/net/tmwa/gui/partytab.h
+src/net/tmwa/guildhandler.cpp
+src/net/tmwa/guildhandler.h
+src/net/tmwa/inventoryhandler.cpp
+src/net/tmwa/inventoryhandler.h
+src/net/tmwa/itemhandler.cpp
+src/net/tmwa/itemhandler.h
+src/net/tmwa/loginhandler.cpp
+src/net/tmwa/loginhandler.h
+src/net/tmwa/messagehandler.cpp
+src/net/tmwa/messagehandler.h
+src/net/tmwa/messagein.cpp
+src/net/tmwa/messagein.h
+src/net/tmwa/messageout.cpp
+src/net/tmwa/messageout.h
+src/net/tmwa/network.cpp
+src/net/tmwa/network.h
+src/net/tmwa/npchandler.cpp
+src/net/tmwa/npchandler.h
+src/net/tmwa/partyhandler.cpp
+src/net/tmwa/partyhandler.h
+src/net/tmwa/playerhandler.cpp
+src/net/tmwa/playerhandler.h
+src/net/tmwa/protocol.h
+src/net/tmwa/specialhandler.cpp
+src/net/tmwa/specialhandler.h
+src/net/tmwa/token.h
+src/net/tmwa/tradehandler.cpp
+src/net/tmwa/tradehandler.h
+src/net/tradehandler.h
+src/net/worldinfo.h
+src/openglgraphics.cpp
+src/openglgraphics.h
+src/particle.cpp
+src/particle.h
+src/particlecontainer.cpp
+src/particlecontainer.h
+src/particleemitter.cpp
+src/particleemitter.h
+src/particleemitterprop.h
+src/party.cpp
+src/party.h
+src/playerinfo.cpp
+src/playerinfo.h
+src/playerrelations.cpp
+src/playerrelations.h
+src/position.cpp
+src/position.h
+src/properties.h
+src/resources/action.cpp
+src/resources/action.h
+src/resources/ambientlayer.cpp
+src/resources/ambientlayer.h
+src/resources/animation.cpp
+src/resources/animation.h
+src/resources/beinginfo.cpp
+src/resources/beinginfo.h
+src/resources/colordb.cpp
+src/resources/colordb.h
+src/resources/dye.cpp
+src/resources/dye.h
+src/resources/emotedb.cpp
+src/resources/emotedb.h
+src/resources/image.cpp
+src/resources/image.h
+src/resources/imageloader.cpp
+src/resources/imageloader.h
+src/resources/imageset.cpp
+src/resources/imageset.h
+src/resources/imagewriter.cpp
+src/resources/imagewriter.h
+src/resources/itemdb.cpp
+src/resources/itemdb.h
+src/resources/iteminfo.cpp
+src/resources/iteminfo.h
+src/resources/mapreader.cpp
+src/resources/mapreader.h
+src/resources/monsterdb.cpp
+src/resources/monsterdb.h
+src/resources/music.cpp
+src/resources/music.h
+src/resources/npcdb.cpp
+src/resources/npcdb.h
+src/resources/resource.cpp
+src/resources/resource.h
+src/resources/resourcemanager.cpp
+src/resources/resourcemanager.h
+src/resources/soundeffect.cpp
+src/resources/soundeffect.h
+src/resources/specialdb.cpp
+src/resources/specialdb.h
+src/resources/spritedef.cpp
+src/resources/spritedef.h
+src/resources/theme.cpp
+src/resources/theme.h
+src/resources/userpalette.cpp
+src/resources/userpalette.h
+src/resources/wallpaper.cpp
+src/resources/wallpaper.h
+src/rotationalparticle.cpp
+src/rotationalparticle.h
+src/shopitem.cpp
+src/shopitem.h
+src/simpleanimation.cpp
+src/simpleanimation.h
+src/sound.cpp
+src/sound.h
+src/sprite.h
+src/statuseffect.cpp
+src/statuseffect.h
+src/text.cpp
+src/text.h
+src/textmanager.cpp
+src/textmanager.h
+src/textparticle.cpp
+src/textparticle.h
+src/textrenderer.h
+src/tileset.h
+src/units.cpp
+src/units.h
+src/utils/base64.cpp
+src/utils/base64.h
+src/utils/copynpaste.cpp
+src/utils/copynpaste.h
+src/utils/dtor.h
+src/utils/gettext.h
+src/utils/mathutils.h
+src/utils/mkdir.cpp
+src/utils/mkdir.h
+src/utils/mutex.h
+src/utils/sha256.cpp
+src/utils/sha256.h
+src/utils/specialfolder.cpp
+src/utils/specialfolder.h
+src/utils/stringutils.cpp
+src/utils/stringutils.h
+src/utils/xml.cpp
+src/utils/xml.h
+src/utils/zlib.cpp
+src/utils/zlib.h
+src/variabledata.h
+src/vector.cpp
+src/vector.h
+src/winver.h
+tools/dyecmd/CMakeLists.txt
+tools/dyecmd/src/CMakeLists.txt
+tools/dyecmd/src/dye.cpp
+tools/dyecmd/src/dye.h
+tools/dyecmd/src/dyecmd.cpp
+tools/dyecmd/src/imagewriter.cpp
+tools/dyecmd/src/imagewriter.h
+tools/tmxcopy/base64.cpp
+tools/tmxcopy/base64.h
+tools/tmxcopy/map.cpp
+tools/tmxcopy/readme.txt
+tools/tmxcopy/tmx_random_fill.cpp
+tools/tmxcopy/tmxcollide.cpp
+tools/tmxcopy/tmxcopy.cpp
+tools/tmxcopy/tostring.h
+tools/tmxcopy/xmlutils.cpp
+tools/tmxcopy/xmlutils.h
+tools/tmxcopy/zlibutils.cpp
+tools/tmxcopy/zlibutils.h
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 221b60d6..c845e687 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -205,6 +205,8 @@ Section "Core files (required)" SecCore
   File "${SRCDIR}\README.txt"
   SetOutPath "$INSTDIR\data\fonts"
   File "${SRCDIR}\data\fonts\*.ttf"
+  SetOutPath "$INSTDIR\data\graphics"
+  File "${SRCDIR}\data\graphics\*.png"
   SetOutPath "$INSTDIR\data\graphics\gui"
   File "${SRCDIR}\data\graphics\gui\*.png"
   File "${SRCDIR}\data\graphics\gui\*.xml"
diff --git a/po/ar.po b/po/ar.po
index 08a461b1..a14f609c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-06-08 22:01+0000\n"
 "Last-Translator: Thorbjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -20,475 +20,455 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "تثبيت"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "جار� الاتّصال..."
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "ولوج"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "إنتقاء الشخصيّة"
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "تغيير"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "خطأ"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "كلمة السرّ:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "تغيير"
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "إلغاء التسجيل"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:274
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -497,39 +477,39 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -543,34 +523,34 @@ msgstr ""
 msgid "Buy"
 msgstr "شراء"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "مغادرة"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -584,11 +564,11 @@ msgstr "بيع"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "إلغاء"
@@ -661,14 +641,14 @@ msgstr "إنشاء شخصيّة"
 msgid "Name:"
 msgstr "الاسم:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -685,8 +665,8 @@ msgstr "لون الشعر:"
 msgid "Hair style:"
 msgstr "قصّة الشعر:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "إنشاء"
 
@@ -742,8 +722,8 @@ msgstr "إلغاء التسجيل"
 msgid "Change Email"
 msgstr "تغيير"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "حذ�"
 
@@ -751,24 +731,24 @@ msgstr "حذ�"
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -834,8 +814,8 @@ msgstr "مؤثّرات محيطة"
 msgid "Equipment"
 msgstr "العتاد"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
@@ -843,7 +823,7 @@ msgstr "تجريد من العتاد"
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
@@ -855,81 +835,84 @@ msgstr "الجردة"
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "استعمال العتاد"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "استخدام"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "إسقاط"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "قسم"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "إسقاط"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "انتقاء كمّيّة من المواد لقسمها."
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "التأثير: %s"
@@ -959,40 +942,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "التّالي"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1007,7 +990,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1094,7 +1077,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1166,59 +1149,59 @@ msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارÙ
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "الخادوم:"
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "المن�ذ:"
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "الخادوم:"
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "جار� الاتّصال..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "مؤشّر مخصّص"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "رجاء طباعة عنوان ومن�ذ الخادوم."
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1255,50 +1238,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1382,27 +1365,31 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1458,491 +1445,462 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "ملء الشاشة"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "مؤشّر مخصّص"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "حدّ FPS:"
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "مرئية"
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "عتمة واجهة المستخدم"
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "مؤثّرات محيطة"
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "لا"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "جار� ملء الشاشة"
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "يجب إعادة التشغيل لت�عّل التغييرات."
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "تغيير OpenGL"
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "مهارات"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "مهارات"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "المستوى: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "هل أنت متأكّد من حذ� هذه الشخصيّة؟"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "هل أنت متأكّد من حذ� هذه الشخصيّة؟"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "إنشاء شخصيّة"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "النقود: %d"
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "إحصائيات الشخصيّة جيّدة"
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "المستوى: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "اقتراح متاجرة"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "إضا�ة"
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "أنت تقدّم:"
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "أنت تقدّم:"
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "تغيير"
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1981,78 +1939,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2129,53 +2015,53 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2200,482 +2086,495 @@ msgstr "تغيير"
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
 msgid "You Died"
 msgstr "أنت تقدّم:"
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
 msgid "Character's stats are too high."
 msgstr "إحصائيات الشخصيّة جيّدة"
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 #, fuzzy
 msgid "Character's stats are too low."
 msgstr "إحصائيات الشخصيّة جيّدة"
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2752,11 +2651,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2766,187 +2665,134 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "قوّة الذات:"
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "القوّة:"
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "خ�ّة الحركة:"
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "نشاط:"
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "ذكاء:"
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "المهارة:"
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2960,73 +2806,118 @@ msgstr "الاسم:"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "د�اع %+d"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "مهاجمة %+d"
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "د�اع %+d"
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3071,27 +2962,27 @@ msgstr ""
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3167,15 +3058,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3183,15 +3074,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3199,15 +3090,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3264,7 +3155,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3272,242 +3163,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3523,58 +3409,61 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr "مهاجمة %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr "د�اع %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "النقود: %d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "المستوى: %d"
+
 #~ msgid "Willpower:"
 #~ msgstr "قوّة الذات:"
 
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "قوّة الذات:"
+
 #~ msgid "Description: %s"
 #~ msgstr "الوص�: %s"
 
diff --git a/po/bg.po b/po/bg.po
index c82a4f67..a098616a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-10-21 13:06+0000\n"
 "Last-Translator: Mila <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -19,468 +19,448 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "�епозната команда."
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Помощ --"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:274
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -489,39 +469,39 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -535,34 +515,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -576,11 +556,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -653,14 +633,14 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -675,8 +655,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -731,8 +711,8 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
@@ -740,24 +720,24 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -823,8 +803,8 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
@@ -832,7 +812,7 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
@@ -844,80 +824,83 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -946,40 +929,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -993,7 +976,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1079,7 +1062,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1151,56 +1134,56 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1237,50 +1220,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1364,27 +1347,31 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1440,484 +1427,457 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-msgid "Level"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1956,78 +1916,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2104,53 +1992,53 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2174,388 +2062,401 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2563,91 +2464,91 @@ msgstr ""
 msgid "Unknown error."
 msgstr "�епозната команда."
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "�епозната команда."
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "�епозната команда."
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2724,11 +2625,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2738,187 +2639,135 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "�епозната команда."
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2931,70 +2780,115 @@ msgstr ""
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3039,27 +2933,27 @@ msgstr ""
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3135,15 +3029,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3151,15 +3045,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3167,15 +3061,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3231,7 +3125,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3239,242 +3133,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3490,51 +3379,42 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 6e15af1b..6863372c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-06-08 22:01+0000\n"
 "Last-Translator: Thorbjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -19,470 +19,450 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "canvi"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "canvi"
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:274
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -491,39 +471,39 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -537,34 +517,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "sortir"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -578,11 +558,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -655,14 +635,14 @@ msgstr ""
 msgid "Name:"
 msgstr "nom"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -677,8 +657,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -734,8 +714,8 @@ msgstr ""
 msgid "Change Email"
 msgstr "canvi"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
@@ -743,24 +723,24 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -826,8 +806,8 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
@@ -835,7 +815,7 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
@@ -847,80 +827,83 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -950,40 +933,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -997,7 +980,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1083,7 +1066,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1155,56 +1138,56 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1241,50 +1224,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1368,27 +1351,31 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1444,485 +1431,458 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "no"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-msgid "Level"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "canvi"
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1961,78 +1921,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2109,53 +1997,53 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2180,478 +2068,491 @@ msgstr "canvi"
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2728,11 +2629,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2742,186 +2643,134 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2935,70 +2784,115 @@ msgstr "nom"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3043,27 +2937,27 @@ msgstr ""
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3139,15 +3033,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3155,15 +3049,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3171,15 +3065,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3235,7 +3129,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3243,242 +3137,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3494,52 +3383,43 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index e9bc185f..4fb50c54 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-12-04 15:16+0000\n"
 "Last-Translator: David Kolibá� <david@kolibac.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -19,484 +19,461 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Čeká se na server"
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Přihlášení"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Vyber postavu"
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Heslo:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Změnit"
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Zrušit registraci"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Neznámý příkaz."
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Nápověda --"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Zobrazit tuto nápovědu"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Zobrazit jméno mapy"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Zobrazit po�et uživatelů on-line"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Říct něco o sobě"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Vy�istit toto okno"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Odeslat soukromou zprávu uživateli"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Jiné ozna�ení pro msg"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Jiné ozna�ení pro msg"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Založit kartu pro soukromé zprávy jinému uživateli"
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Jiné ozna�ení pro query"
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Zobrazit seznam všech veřejných kanálů"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Připojit se, nebo vytvořit kanál"
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/party >Pozvat uživatele do party"
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party >Pozvat uživatele do party"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Spustit nahrávání záznamu chatu do externího souboru"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globální oznámení (jen GM)"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Pro bližší informace zadejte /help <command>."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Příkaz: /help"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Tento příkaz zobrazí seznam všech příkazů, které jsou k dispozici."
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Příkaz: /help <command>"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Tento příkaz zobrazí nápovědu k <command>."
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Příkaz: /announce <msg>"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** K dispozici pouze pro GM ***"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Tento příkaz odešle zprávu <msg> všem hrá�ům, kteří jsou on-line."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Příkaz: /clear"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Tento příkaz vy�istí záznam předchozího chatu."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Příkaz: /join <channel>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Tento příkaz zobrazí po�et hrá�ů, kteří jsou momentálně online."
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Příkaz: /join <channel>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Tento příkaz vás připojí ke kanálu <channel>."
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Pokud <channel> neexistuje, bude vytvořen."
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Příkaz: /list"
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Tento příkaz zobrazí seznam všech kanálů."
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Příkaz: /me <message>"
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Příkaz: /msg <nick> <message>"
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Příkaz: /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Příkaz: /w <nick> <message>"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Tento příkaz odešle zprávu <message> uživateli <nick>."
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Pokud <nick> obsahuje mezeru, uzavřete jej do uvozovek (\")."
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Příkaz: /query <nick>"
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Příkaz: /q <nick>"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Příkaz: /w <nick> <message>"
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-#, fuzzy
-msgid "Command: /away"
-msgstr "Příkaz: /clear"
-
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Tento příkaz vy�istí záznam předchozího chatu."
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Příkaz: /party <nick>"
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Tento příkaz vás připojí ke kanálu <channel>."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Příkaz: /party <nick>"
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Příkaz: /present"
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Příkaz: /record <filename>"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Příkaz: /record"
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Příkaz: /toggle <state>"
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Příkaz: /toggle"
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Příkaz: /announce <msg>"
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Tento příkaz zobrazí název aktuální mapy."
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Tento příkaz zobrazí po�et hrá�ů, kteří jsou momentálně online."
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -505,42 +482,42 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Snímek obrazovky uložen do ~/"
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Připojení k serveru bylo ztraceno, program nyní bude ukon�en"
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Nelze nahrát mapu"
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při na�ítání %s"
@@ -554,34 +531,34 @@ msgstr "Parta (%s)"
 msgid "Buy"
 msgstr "Nákup"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Ukon�it"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "VÅ¡e"
 
@@ -595,11 +572,11 @@ msgstr "Prodej"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Zrušit"
@@ -674,14 +651,14 @@ msgstr "Vytvořit postavu"
 msgid "Name:"
 msgstr "Jméno:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -698,8 +675,8 @@ msgstr "Barva vlasů:"
 msgid "Hair style:"
 msgstr "Ú�es:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -755,8 +732,8 @@ msgstr "Zrušit registraci"
 msgid "Change Email"
 msgstr "Změnit e-mail"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Smazat"
 
@@ -765,24 +742,24 @@ msgstr "Smazat"
 msgid "Choose"
 msgstr "Barvy"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d hrá�i jsou přítomni."
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -848,8 +825,8 @@ msgstr ""
 msgid "Equipment"
 msgstr "Vybavení"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Odstranit z vybavení"
 
@@ -857,7 +834,7 @@ msgstr "Odstranit z vybavení"
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
@@ -869,81 +846,84 @@ msgstr "Inventář"
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr "Sloty:"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Vybavit"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Použít"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Upustit"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Rozdělit"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Hmotnost:"
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Upustit"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "VÅ¡e"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství předmětů, které chcete upustit."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Hmotnost: "
@@ -974,40 +954,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Mapa"
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Čeká se na server"
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Další"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Reset"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1022,7 +1002,7 @@ msgstr ""
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1110,7 +1090,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1182,61 +1162,61 @@ msgstr "Heslo musí být kratší než %d znaků."
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Vyberte si server"
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Připojuji se..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Vlastní kurzor"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Prosím zadejte adresu a port serveru."
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Čeká se na server"
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1274,54 +1254,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Duha"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Hrát"
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Červená: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Zelená: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1405,27 +1385,31 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Povolit obchodování"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Hrá�i"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1481,501 +1465,471 @@ msgstr "střední"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Celá obrazovka"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Vlastní kurzor"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Velikost písma"
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Ne"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Přepnout na celou obrazovku"
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Pro uplatnění změn je potřeba restart."
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Přepnout OpenGL"
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Změny v OpenGL vyžadují restart."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "Změny se projeví až po změně mapy."
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Dovednosti"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Dovednosti"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Úroveň: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Vytvořit guildu"
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Opravdu chcete skon�it?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party >Pozvat uživatele do party"
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party >Pozvat uživatele do party"
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Opravdu chcete skon�it?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Vytvořit guildu"
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Vytvořit postavu"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Pozvat uživatele"
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Velký"
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijmout pozvání od %s."
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnout pozvání od %s."
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijmout pozvání od %s."
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnout pozvání od %s."
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guilda"
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Vyberte si server"
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vás zve ke vstupu do party: %s"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s vás zve ke vstupu do své party."
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s"
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vás zve ke vstupu do své party."
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s"
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Parta"
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Vyberte si server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Peníze: %s"
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "Peníze: %d"
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Úroveň: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Nabídnout obchod"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Souhlasit s obchodem"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Obchod"
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Přidat"
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Změnit"
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Nemáte dost peněz."
 
@@ -2014,82 +1968,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Jména ostatních hrá�ů"
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "Jména GM"
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Monstra"
-
-#: src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Parta"
-
-#: src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Guilda"
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Jména ostatních hrá�ů"
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Kritický zásah"
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Kritický zásah"
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2166,55 +2044,55 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Globální oznámení:"
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globální oznámení od %s:"
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Nelze poslat prázdný chat!"
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Příkaz: /record"
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Tento příkaz zobrazí po�et hrá�ů, kteří jsou momentálně online."
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2241,390 +2119,403 @@ msgstr "Změnit"
 msgid "Choose World"
 msgstr "Vyberte si server"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Útok"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Cíl & Útok"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Smajlíky"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Zastavit Útok"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Monstra"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Sednout si"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Nastavení:"
 
-#: src/main.cpp:44
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:45
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/help > Zobrazit tuto nápovědu"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2632,93 +2523,93 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Neznámý předmět"
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr "Info"
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Neznámý příkaz."
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 #, fuzzy
 msgid "Error joining channel."
 msgstr "Příkaz: /join <channel>"
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "Neznámý příkaz."
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2801,11 +2692,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2815,189 +2706,136 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr "Odmítnout pozvání od %s."
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Síla"
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Hbitost"
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Obratnost"
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Vitalita"
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Inteligence"
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Å eptat"
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Děkuji za nákup."
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Děkuji za prodej."
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Neznámý předmět"
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Síla:"
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Hbitost:"
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitalita:"
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Inteligence:"
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Obratnost:"
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Štěstí:"
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Hrá�"
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -3011,73 +2849,118 @@ msgstr "Jméno"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Síla"
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Hbitost"
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Vitalita"
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Inteligence"
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Obratnost"
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Štěstí"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Obrana:"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "M.Útok:"
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "M.Obrana:"
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Přesnost:"
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% Únik:"
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Kritický zásah"
@@ -3124,27 +3007,27 @@ msgstr "Tento příkaz odešle zprávu <message> uživateli <nick>."
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3220,15 +3103,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3236,15 +3119,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3252,15 +3135,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3319,7 +3202,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3327,242 +3210,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
-#, fuzzy, c-format
-msgid "Invited user %s to party."
-msgstr "/party >Pozvat uživatele do party"
-
-#: src/net/tmwa/partyhandler.cpp:340
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3578,52 +3456,43 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr "Útok %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr "Obrana %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr "Neznámý předmět"
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
@@ -3656,6 +3525,15 @@ msgstr ""
 #~ msgid "Server"
 #~ msgstr "Server"
 
+#~ msgid "Other Players' Names"
+#~ msgstr "Jména ostatních hrá�ů"
+
+#~ msgid "GM Names"
+#~ msgstr "Jména GM"
+
+#~ msgid "Monsters"
+#~ msgstr "Monstra"
+
 #~ msgid "Hats"
 #~ msgstr "Klobouky"
 
@@ -3685,10 +3563,29 @@ msgstr ""
 #~ msgid "Ammo"
 #~ msgstr "Munice"
 
+#~ msgid "Critical Hit"
+#~ msgstr "Kritický zásah"
+
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
+
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Peníze: %d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Úroveň: %d"
+
 #, fuzzy
 #~ msgid "Access denied."
 #~ msgstr "Přístup zamítnut"
 
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Å eptat"
+
 #~ msgid "no"
 #~ msgstr "ne"
 
diff --git a/po/da.po b/po/da.po
index ea6c9983..6b8b6e2f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
-"PO-Revision-Date: 2010-12-06 19:31+0100\n"
-"Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
+"PO-Revision-Date: 2009-07-25 17:33+0000\n"
+"Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
@@ -19,417 +19,363 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/npcdialog.cpp:183
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Næste"
-
-#: ../src/main.cpp:60
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : Start mana uden OpenGL"
-
-#: ../src/main.cpp:58
-#, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir : Directory der skal bruges som hjemmekatalog"
-
-#: ../src/main.cpp:52
-#, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -u --skip-update : Undlad at hente updateringer"
-
-#: ../src/main.cpp:46
-#, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Ønsket konfigurationsfil"
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Opsætning"
 
-#: ../src/main.cpp:53
+#: src/client.cpp:679
 #, fuzzy
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default : Vælg karakter-server og karakter"
+msgid "Connecting to server"
+msgstr "Opretter forbindelse til kort-serveren..."
 
-#: ../src/main.cpp:57
+#: src/client.cpp:706
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir : Directory der skal bruges som hjemmekatalog"
+msgid "Logging in"
+msgstr "Log Ind"
 
-#: ../src/main.cpp:48
-#, fuzzy
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Anvend dette password"
+#: src/client.cpp:739
+msgid "Entering game world"
+msgstr ""
 
-#: ../src/main.cpp:47
+#: src/client.cpp:804
 #, fuzzy
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Anvend dette brugernavn"
+msgid "Requesting characters"
+msgstr "Vælg Karakter"
 
-#: ../src/main.cpp:49
+#: src/client.cpp:833
 #, fuzzy
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Log på som denne karakter"
+msgid "Connecting to the game server"
+msgstr "Opretter forbindelse til kort-serveren..."
 
-#: ../src/main.cpp:56
+#: src/client.cpp:843
 #, fuzzy
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Directory med data til spillet"
+msgid "Changing game servers"
+msgstr "Server"
 
-#: ../src/main.cpp:45
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help : Vis denne hjælpebesked"
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Fejl"
 
-#: ../src/main.cpp:51
-#, fuzzy
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Login server port"
+#: src/client.cpp:888
+msgid "Requesting registration details"
+msgstr ""
 
-#: ../src/main.cpp:50
+#: src/client.cpp:915
 #, fuzzy
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Login server navn or IP"
+msgid "Password Change"
+msgstr "Adgangskode:"
 
-#: ../src/main.cpp:55
-#, fuzzy
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Undlad at hente updateringer"
+#: src/client.cpp:916
+msgid "Password changed successfully!"
+msgstr ""
 
-#: ../src/main.cpp:44
+#: src/client.cpp:935
 #, fuzzy
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Vis versionsnummer"
-
-#: ../src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1  Det er varmt anbefalet at"
+msgid "Email Change"
+msgstr "Ændre"
 
-#: ../src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1  Opdateringsprocessen er ikke færdiggjort"
+#: src/client.cpp:936
+msgid "Email changed successfully!"
+msgstr ""
 
-#: ../src/gui/updatewindow.cpp:421
+#: src/client.cpp:956
 #, fuzzy
-msgid "##1  you try again later."
-msgstr "##1  du prøver igen senere"
-
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% præcission:"
-
-#: ../src/net/tmwa/generalhandler.cpp:230
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "Kritisk sår"
-
-#: ../src/net/tmwa/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% Undgå angreb."
-
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr ""
+msgid "Unregister Successful"
+msgstr "Frameld"
 
-#: ../src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
+#: src/client.cpp:957
+msgid "Farewell, come back any time..."
 msgstr ""
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:291
+#: src/client.cpp:1281
 #, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s blev medlem af gruppen."
+msgid "Invalid update host: %s"
+msgstr "Ugyldig opdaterings host: "
 
-#: ../src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s har inviteret med i %s's gruppe."
+#: src/client.cpp:1315 src/client.cpp:1321
+msgid "Error creating updates directory!"
+msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: ../src/gui/socialwindow.cpp:561
-#, fuzzy, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s har inviteret med i %s's gruppe."
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
+msgid "Unknown command."
+msgstr "Ukendt kommando"
 
-#: ../src/gui/socialwindow.cpp:600
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s har inviteret med i sin gruppe"
+#: src/commandhandler.cpp:160
+msgid "-- Help --"
+msgstr "--Hjælp--"
 
-#: ../src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#: src/commandhandler.cpp:161
+msgid "/help > Display this help"
+msgstr "/help > Vis denne hjælpebesked"
 
-#: ../src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s har forladt gruppen."
+#: src/commandhandler.cpp:163
+msgid "/where > Display map name"
+msgstr "/where > Vis dine koordinater på kortet"
 
-#: ../src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#: src/commandhandler.cpp:164
+msgid "/who > Display number of online users"
+msgstr "/who > Vis antallet af spillere der er online"
 
-#: ../src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s er allerede medlem af en gruppe."
+#: src/commandhandler.cpp:165
+msgid "/me > Tell something about yourself"
+msgstr "/me > Vis en beskrivelse af dig"
 
-#: ../src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s er ikke medlem af din gruppe!"
+#: src/commandhandler.cpp:167
+msgid "/clear > Clears this window"
+msgstr "/clear > Sletter text i chat-vinduet."
 
-#: ../src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s er nu medlem af din gruppe."
+#: src/commandhandler.cpp:169
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Send en privat besked til en spiller"
 
-#: ../src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s blev medlem af gruppen."
+#: src/commandhandler.cpp:170
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Samme som msg"
 
-#: ../src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
+#: src/commandhandler.cpp:171
+msgid "/w > Alias of msg"
+msgstr "/w > Samme som msg"
+
+#: src/commandhandler.cpp:172
+msgid "/query > Makes a tab for private messages with another user"
+msgstr "/query > Starter en privat samtale med en spiller"
+
+#: src/commandhandler.cpp:174
+msgid "/q > Alias of query"
+msgstr "/q > Samme som query"
+
+#: src/commandhandler.cpp:176
+msgid "/ignore > ignore a player"
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s afviste din invitation."
+#: src/commandhandler.cpp:177
+msgid "/unignore > stop ignoring a player"
+msgstr ""
 
-#: ../src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s afviste din invitation."
+#: src/commandhandler.cpp:179
+msgid "/list > Display all public channels"
+msgstr "/list > Vis alle offentlige chat-kanaler"
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s vil gerne handle med dig. Accepterer du?"
+#: src/commandhandler.cpp:180
+msgid "/join > Join or create a channel"
+msgstr "/join > Deltag i en chat-kanal"
 
-#: ../src/gui/widgets/chattab.cpp:152
-#, fuzzy, c-format
-msgid "%s whispers: %s"
-msgstr "%s hvisker: "
+#: src/commandhandler.cpp:182
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Opret en ny gruppe"
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
-msgid "(empty)"
-msgstr ""
+#: src/commandhandler.cpp:183
+msgid "/party > Invite a user to party"
+msgstr "/party > Inviter en spiller til din gruppe"
 
-#: ../src/commandhandler.cpp:222
-msgid "*** only available to a GM ***"
-msgstr "*** kun tilgængelig for en GM ***"
+#: src/commandhandler.cpp:185
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Gem/ chat i en lokal fil"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
-msgid "+"
-msgstr ""
+#: src/commandhandler.cpp:187
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr "/toggle > Afgør om et tryk på retur-knappen skal aktivere chatvinduet."
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
-msgid "-"
+#: src/commandhandler.cpp:189
+msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
+"/present > Vis en liste af alle spillere på serveren (Sendes til chat-loggen "
+"hvis den er slået til)"
 
-#: ../src/commandhandler.cpp:166
-msgid "-- Help --"
-msgstr "--Hjælp--"
-
-#: ../src/commandhandler.cpp:201
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Send en besked til allle spillere (Kun for GM)"
 
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
+#: src/commandhandler.cpp:196
+msgid "For more information, type /help <command>."
+msgstr "/help <kommando>   > Vis en detaljeret beskrivelse af <kommando>"
 
-#: ../src/commandhandler.cpp:173
-msgid "/clear > Clears this window"
-msgstr "/clear > Sletter text i chat-vinduet."
+#: src/commandhandler.cpp:200
+msgid "Command: /help"
+msgstr "Kommando: /help"
 
-#: ../src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Lukker hviskesamtale-tabben"
+#: src/commandhandler.cpp:201
+msgid "This command displays a list of all commands available."
+msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
 
-#: ../src/commandhandler.cpp:191
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Opret en ny gruppe"
+#: src/commandhandler.cpp:203
+msgid "Command: /help <command>"
+msgstr "Kommando: /help <kommando>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/item > Vis/ret hvordan partyet deler exp"
+#: src/commandhandler.cpp:204
+msgid "This command displays help on <command>."
+msgstr "Denne kommando viser hjælp for <kommando>"
 
-#: ../src/commandhandler.cpp:167
-msgid "/help > Display this help"
-msgstr "/help > Vis denne hjælpebesked"
+#: src/commandhandler.cpp:212
+msgid "Command: /announce <msg>"
+msgstr "Kommando: /announce <besked>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Vis denne hjælpebesked."
+#: src/commandhandler.cpp:213
+msgid "*** only available to a GM ***"
+msgstr "*** kun tilgængelig for en GM ***"
 
-#: ../src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
-msgstr ""
+#: src/commandhandler.cpp:214
+msgid "This command sends the message <msg> to all players currently online."
+msgstr "Denne kommando sender beskeden <besked> til alle brugere online."
 
-#: ../src/commandhandler.cpp:185
-msgid "/ignore > ignore a player"
-msgstr ""
+#: src/commandhandler.cpp:219
+msgid "Command: /clear"
+msgstr "Kommando: /clear"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Inviter en spiller med i din gruppe"
+#: src/commandhandler.cpp:220
+msgid "This command clears the chat log of previous chat."
+msgstr "Denne kommando rydder chat loggen"
 
-#: ../src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Inviter en spiller med i din gruppe"
+#: src/commandhandler.cpp:224
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Kommand: /item <regel>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > Vis/ret hvordan gruppen deler fundne tin"
+#: src/commandhandler.cpp:225
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+"Denne kommando viser det antal af online brugere, der er online  lige nu."
 
-#: ../src/commandhandler.cpp:189
-msgid "/join > Join or create a channel"
-msgstr "/join > Deltag i en chat-kanal"
+#: src/commandhandler.cpp:230
+msgid "Command: /join <channel>"
+msgstr "Kommando: : /join <chat-kanal>"
 
-#: ../src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Spark en bruger ud af kanalen"
+#: src/commandhandler.cpp:231
+msgid "This command makes you enter <channel>."
+msgstr "Denne kommando tilmelder dig til <chat-kanal>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
-#, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Spark en spiller ud a din gruppe"
+#: src/commandhandler.cpp:232
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Hvis <chat-kanal> ikke eksisterer, så bliver den oprettet."
 
-#: ../src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Spark en spiller ud a din gruppe"
+#: src/commandhandler.cpp:236
+msgid "Command: /list"
+msgstr "Kommando: /list"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
-#, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/invite > Forlad den gruppe du er med i"
+#: src/commandhandler.cpp:237
+msgid "This command shows a list of all channels."
+msgstr "Denne kommando viser en liste over alle chat-kanaler."
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/invite > Forlad den gruppe du er med i"
+#: src/commandhandler.cpp:241
+msgid "Command: /me <message>"
+msgstr "Kommando: /me <besked>"
 
-#: ../src/commandhandler.cpp:188
-msgid "/list > Display all public channels"
-msgstr "/list > Vis alle offentlige chat-kanaler"
+#: src/commandhandler.cpp:242
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Denne kommando fortæller andre at du er (eller gør) <besked>"
 
-#: ../src/commandhandler.cpp:171
-msgid "/me > Tell something about yourself"
-msgstr "/me > Vis en beskrivelse af dig"
+#: src/commandhandler.cpp:246
+msgid "Command: /msg <nick> <message>"
+msgstr "Kommando: /msg <spiller> <besked>"
 
-#: ../src/commandhandler.cpp:175
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Send en privat besked til en spiller"
+#: src/commandhandler.cpp:247
+msgid "Command: /whisper <nick> <message>"
+msgstr "Kommando: /whisper <spiller> <besked>"
 
-#: ../src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Udnævn en bruger til operator"
+#: src/commandhandler.cpp:248
+msgid "Command: /w <nick> <message>"
+msgstr "Kommando: /w <spiller> <besked>"
 
-#: ../src/commandhandler.cpp:192
-msgid "/party > Invite a user to party"
-msgstr "/party > Inviter en spiller til din gruppe"
+#: src/commandhandler.cpp:249
+msgid "This command sends the text <message> to <nick>."
+msgstr "Denne kommando sender <besked> til <spiller>"
 
-#: ../src/commandhandler.cpp:198
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
-"/present > Vis en liste af alle spillere på serveren (Sendes til chat-loggen "
-"hvis den er slået til)"
-
-#: ../src/commandhandler.cpp:180
-msgid "/q > Alias of query"
-msgstr "/q > Samme som query"
+"Hvis <spilller>  (altså spillerens navn) indeholder mellemrum, så kan du "
+"sætter gåseøjne (\")."
 
-#: ../src/commandhandler.cpp:178
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Starter en privat samtale med en spiller"
+#: src/commandhandler.cpp:255
+msgid "Command: /query <nick>"
+msgstr "Kommando: /query <spilller>"
 
-#: ../src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Forlad denne kanal"
+#: src/commandhandler.cpp:256
+msgid "Command: /q <nick>"
+msgstr "Kommando: /q <spiller>"
 
-#: ../src/commandhandler.cpp:194
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Gem/ chat i en lokal fil"
+#: src/commandhandler.cpp:257
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+msgstr ""
+"Denne kommando opretter en ny tab med privat samtale mellem dig og <nick>."
 
-#: ../src/commandhandler.cpp:196
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Afgør om et tryk på retur-knappen skal aktivere chatvinduet."
+#: src/commandhandler.cpp:262
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Kommando: /create <gruppe>"
 
-#: ../src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Vælg emne for denne kanal"
+#: src/commandhandler.cpp:263
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Disse kommandoer opretter en gruppe ved navn <gruppe>"
 
-#: ../src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
+#: src/commandhandler.cpp:267
+msgid "Command: /party <nick>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:186
-msgid "/unignore > stop ignoring a player"
-msgstr ""
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Denne kommando inviterer <spiller> til din gruppe."
 
-#: ../src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Vis alle brugere på kanalen"
+#: src/commandhandler.cpp:274
+msgid "Command: /present"
+msgstr "Kommando: /present"
 
-#: ../src/commandhandler.cpp:177
-msgid "/w > Alias of msg"
-msgstr "/w > Samme som msg"
+#: src/commandhandler.cpp:275
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+"Denne kommando finder en liste over brugere, der er inden for en "
+"lytteradius, og sender listen til enten record loggen, hvis du optager, "
+"ellers er det chat loggen."
 
-#: ../src/commandhandler.cpp:169
-msgid "/where > Display map name"
-msgstr "/where > Vis dine koordinater på kortet"
+#: src/commandhandler.cpp:281
+msgid "Command: /record <filename>"
+msgstr "Kommando: /record <filnamn>"
 
-#: ../src/commandhandler.cpp:176
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Samme som msg"
+#: src/commandhandler.cpp:282
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+"Denne kommando starter med at \"optage\" chat-loggen. Den gemmer en kopi i "
+"<filnavn>"
 
-#: ../src/commandhandler.cpp:170
-msgid "/who > Display number of online users"
-msgstr "/who > Vis antallet af spillere der er online"
+#: src/commandhandler.cpp:284
+msgid "Command: /record"
+msgstr "Kommando: /record"
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr ""
+#: src/commandhandler.cpp:285
+msgid "This command finishes a recording session."
+msgstr "Denne kommando stopper med at optage chatten."
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr ""
-"Hvis <regel> er \"1\", \"yes\", eller \"true\" så deler gruppen experience, "
-"men hvis <regel> er \"0\", \"no\", eller \"false\" deler gruppen ikke "
-"experience."
+#: src/commandhandler.cpp:289
+msgid "Command: /toggle <state>"
+msgstr "Kommando /toggle <tilstand>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/commandhandler.cpp:290
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
-"Hvis <regel> er \"1\", \"yes\", eller \"true\" så deler gruppen alle fundne "
-"ting, men hvis <regel> er \"0\", \"no\", eller \"false\" deler gruppen ikke."
+"Denne kommando bestemmer om retur, skal bruges til at fokusere på chat "
+"loggen, ellerom chat om chat loggen, automatisk skal slå fra."
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -438,3505 +384,3436 @@ msgstr ""
 "af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
 "chat vindue fra."
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ""
+#: src/commandhandler.cpp:295
+msgid "Command: /toggle"
+msgstr "Kommando: /toggle"
 
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: src/commandhandler.cpp:296
+msgid "This command displays the return toggle status."
+msgstr "Denne kommando viser fokusering af chat vinduets status."
 
-#: ../src/gui/socialwindow.cpp:566
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
-msgid "Accept Guild Invite"
-msgstr "Accepter invitationen"
+msgid "Command: /unignore <player>"
+msgstr "Kommand: /item <regel>"
 
-#: ../src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Accepter invitationen"
+#: src/commandhandler.cpp:301
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:466
-#, fuzzy, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Du har accepteret en invitation fra %s."
+#: src/commandhandler.cpp:306
+msgid "Command: /where"
+msgstr "kommando: /where"
 
-#: ../src/gui/socialwindow.cpp:447
-#, fuzzy, c-format
-msgid "Accepted party invite from %s."
-msgstr "Du har accepteret en invitation fra %s."
+#: src/commandhandler.cpp:307
+msgid "This command displays the name of the current map."
+msgstr "Denne kommando viser det nuværende bane navn."
 
-#: ../src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Accepterer indkomne handels anmodninger"
+#: src/commandhandler.cpp:311
+msgid "Command: /who"
+msgstr "Kommando: /who"
 
-#: ../src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Kan modtager anmodninger om byttehandler."
+#: src/commandhandler.cpp:312
+msgid "This command displays the number of players currently online."
+msgstr ""
+"Denne kommando viser det antal af online brugere, der er online  lige nu."
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
+#: src/commandhandler.cpp:318
+msgid "Type /help for a list of commands."
+msgstr "Skriv /help for at få en liste med kommandoer"
+
+#: src/commandhandler.cpp:384
+msgid "Cannot send empty whispers!"
+msgstr "du kan ikke sende en hviskebesked uden tekst!"
+
+#: src/commandhandler.cpp:392
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Ret konto og karakter"
+#: src/commandhandler.cpp:406
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Account banned"
-msgstr "Kontoen er slettet"
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Du glemte at skrive et navn på dit party."
 
-#: ../src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Account banned."
-msgstr "Kontoen er slettet"
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
+msgid "Please specify a name."
+msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:162
-#, fuzzy
-msgid "Account expired."
-msgstr "Kontoen er slettet"
+#: src/commandhandler.cpp:450
+msgid "Return toggles chat."
+msgstr "Retur bringer focus på chatten."
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Kontoen er ikke tilsluttet. Du skal først logge ind."
+#: src/commandhandler.cpp:450
+msgid "Message closes chat."
+msgstr "Besked lukker chat."
 
-#: ../src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Brugernavnet eksisterer ikke. log venligst ind igen."
+#: src/commandhandler.cpp:459
+msgid "Return now toggles chat."
+msgstr "Enter bringer nu focus på chatten."
 
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
-msgstr "Konto: %s"
+#: src/commandhandler.cpp:463
+msgid "Message now closes chat."
+msgstr "Besked lukker nu chat."
 
-#: ../src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Tilføj"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:171
-#, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|Tilføj navn til chat@@"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
+msgid "Player already ignored!"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
+#: src/commandhandler.cpp:522
 #, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Tilføj til chat@@"
+msgid "Player successfully ignored!"
+msgstr "Du har nu oprettet gruppen."
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Adræthed"
+#: src/commandhandler.cpp:524
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "Adræthed %+d"
+#: src/commandhandler.cpp:539
+msgid "Player wasn't ignored!"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Adræthed:"
+#: src/commandhandler.cpp:544
+msgid "Player no longer ignored!"
+msgstr ""
 
-#: ../src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Accepter handel"
+#: src/commandhandler.cpp:546
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: ../src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Godkendt. Venter..."
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
 
-#: ../src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "Alle"
+#: src/game.cpp:172
+msgid "General"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Tillad handel"
+#: src/game.cpp:342
+#, fuzzy
+msgid "Screenshot saved as "
+msgstr "Skærmbillede gemt under ~/"
 
-#: ../src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Tillad hviskere"
+#: src/game.cpp:347
+msgid "Saving screenshot failed!"
+msgstr "Gemningen af skærmbilledet fejlede!"
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
+#: src/game.cpp:378
 #, fuzzy
-msgid "Already logged in."
-msgstr "Allerede logget ind"
+msgid "The connection to the server was lost."
+msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
 
-#: ../src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Du er allerede igang med at  optage"
+#: src/game.cpp:382
+msgid "Network Error"
+msgstr "Netværksfejl"
 
-#: ../src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Omgivende FX"
+#: src/game.cpp:721
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorerer indkomne handels anmodninger"
 
-#: ../src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "Omgivende FX"
+#: src/game.cpp:726
+msgid "Accepting incoming trade requests"
+msgstr "Accepterer indkomne handels anmodninger"
+
+#: src/game.cpp:954
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Kunne ikke loade kortet"
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/game.cpp:955
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Et ukendt medlem forsøgte at sige: %s"
+msgid "Error while loading %s"
+msgstr "Kunne ikke loade %s."
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Udslettet."
+#: src/gui/beingpopup.cpp:76
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Gruppe (%s)"
 
-#: ../src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Anvend"
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Køb"
 
-#: ../src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Pris: %s / Total: %s"
 
-#: ../src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
+msgid "+"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Er du sikker på at du vil slette denne karakter?"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
+msgid "-"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:168
-#, fuzzy, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "ER du sikker på at du vil afslutte programmet?"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Afslut"
 
-#: ../src/gui/socialwindow.cpp:247
-#, fuzzy, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "ER du sikker på at du vil afslutte programmet?"
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
+msgid "Max"
+msgstr "Maks"
 
-#: ../src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Tildel"
+#: src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "butik"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Angrib"
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Sælg"
+
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Fortryd"
+
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Skift e-mail adresse"
 
-#: ../src/resources/itemdb.cpp:53
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
-msgid "Attack %+d"
-msgstr "Angreb %+d"
+msgid "Account: %s"
+msgstr "Konto: %s"
+
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
+msgstr "Skriv den nye email-adresse to gange"
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: src/gui/changeemaildialog.cpp:127
 #, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Angreb %+d"
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Brugernavnet skal mindst være %d bogstaver langt."
 
-#: ../src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "Fremmøde skrives til loggen"
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
 
-#: ../src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Lyd"
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "Den nye  email-adresse eksisterer allerede."
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
+msgid "Change Password"
+msgstr "Skift adgangskode"
 
-#: ../src/net/tmwa/generalhandler.cpp:129
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Adgangskode:"
+
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
-msgid "Authentication failed."
-msgstr "Godkendelse fejlede"
+msgid "Type new password twice:"
+msgstr "Skriv den nye email-adresse to gange"
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:100
+#: src/gui/changepassworddialog.cpp:116
 #, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|Bliv ven med %s@@"
+msgid "The new password needs to be at least %d characters long."
+msgstr "Adgangskoden skal mindst være %d bogstaver langt."
 
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Skabning"
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 
-#: ../src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Du siver langtsomt ud af din krop, du kan nu endelig slappe af."
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
 
-#: ../src/playerrelations.cpp:342
-msgid "Blink name"
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Lav en ny karakter."
+
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Navn:"
+
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:138
-#, fuzzy
-msgid "Blue:"
-msgstr "Blå: "
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Bobler med navne"
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
+msgstr "HÃ¥rfarve:"
 
-#: ../src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Bobler uden navne"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
+msgstr "Frisure:"
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Køb"
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
+msgid "Create"
+msgstr "Opret"
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Justering"
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "Mand"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Fortryd"
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "Kvinde"
 
-#: ../src/commandhandler.cpp:422
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
+msgid "Please distribute %d points"
+msgstr "Du mangler at fordele %d points"
 
-#: ../src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "Dit navn skal være mindst 4 bogstaver langt."
 
-#: ../src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
+msgstr "Du har brugt alle dine points"
 
-#: ../src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "Du kan ikke sende en tom chat-besked"
+#: src/gui/charcreatedialog.cpp:256
+#, c-format
+msgid "Please remove %d points"
+msgstr "Du skal fjerne %d points"
 
-#: ../src/commandhandler.cpp:401
-msgid "Cannot send empty whispers!"
-msgstr "du kan ikke sende en hviskebesked uden tekst!"
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Bekræft sletning af karakter"
 
-#: ../src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Kan ikke råbe!"
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "Er du sikker på at du vil slette denne karakter?"
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "Kan ikke bruge denne ID"
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr "Ret konto og karakter"
 
-#: ../src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Ændre"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Frameld"
 
-#: ../src/gui/charselectdialog.cpp:150
+#: src/gui/charselectdialog.cpp:150
 #, fuzzy
 msgid "Change Email"
 msgstr "Skift e-mail adresse"
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Skift e-mail adresse"
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Slet"
 
-#: ../src/gui/worldselectdialog.cpp:76
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
-msgid "Change Login"
-msgstr "Ændre"
+msgid "Choose"
+msgstr "Luk"
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Skift adgangskode"
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
+msgid "(empty)"
+msgstr ""
 
-#: ../src/gui/login.cpp:62
-#, fuzzy
-msgid "Change Server"
-msgstr "Server"
+#: src/gui/chat.cpp:88
+msgid "Chat"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "Ændringerne træder i kraft når du er går til et nyt kort."
+#: src/gui/chat.cpp:311
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
+msgstr "Der er %d spillere til stede"
 
-#: ../src/client.cpp:813
-#, fuzzy
-msgid "Changing game servers"
-msgstr "Server"
+#: src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Fremmøde skrives til loggen"
 
-#: ../src/gui/setup_video.cpp:460
-#, fuzzy
-msgid "Changing to OpenGL"
-msgstr "Skrifter til OpenGL"
+#: src/gui/chat.cpp:493
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Hvisker til %s: %s"
 
-#: ../src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Ja"
+
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Nej"
+
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
 msgstr ""
-"En operator kan gøre andre brugere til operators eller sparke dem ud af "
-"kanalen."
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "Serveren understøtter ikke kanaler!"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Karakteren er slettet"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
+msgstr ""
 
-#: ../src/gui/statuswindow.cpp:238
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
 #, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Du har brugt alle dine points"
+msgid "Map: %s"
+msgstr "Navn: %s"
 
-#: ../src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Du har brugt alle dine points"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "MiniKort"
 
-#: ../src/net/manaserv/charhandler.cpp:143
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Brugernavnet er allerede benyttet af en anden bruger."
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:155
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Du har brugt alle dine points"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Partikeleffekter"
 
-#: ../src/net/manaserv/charhandler.cpp:158
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Du har brugt alle dine points"
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Partikeldetaljer"
 
-#: ../src/gui/chat.cpp:87
-msgid "Chat"
-msgstr ""
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Omgivende FX"
 
-#: ../src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Chat-vindue"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Udstyr"
 
-#: ../src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Det lykkedes ikke at starte en chat."
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
+msgid "Unequip"
+msgstr "Tag af"
 
-#: ../src/gui/charselectdialog.cpp:380
-#, fuzzy
-msgid "Choose"
+#: src/gui/help.cpp:37
+msgid "Help"
+msgstr "Hjælp"
+
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
+msgid "Close"
 msgstr "Luk"
 
-#: ../src/gui/worldselectdialog.cpp:77
-#, fuzzy
-msgid "Choose World"
-msgstr "Vælg din server"
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inventarliste"
 
-#: ../src/gui/serverdialog.cpp:196
-#, fuzzy
-msgid "Choose Your Server"
-msgstr "Vælg din server"
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Opbevaret"
 
-#: ../src/gui/socialwindow.cpp:544
-#, fuzzy
-msgid "Choose your guild's name."
-msgstr "Vælg din server"
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:630
-#, fuzzy
-msgid "Choose your party's name."
-msgstr "Vælg din server"
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
+msgid "Equip"
+msgstr "Tag på"
 
-#: ../src/gui/npcdialog.cpp:98
-msgid "Clear log"
-msgstr ""
+#: src/gui/inventorywindow.cpp:88
+msgid "Use"
+msgstr "Brug"
 
-#: ../src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Du bruger en for gammel version af klienten."
-
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
-msgid "Close"
-msgstr "Luk"
+msgid "Drop..."
+msgstr "Smid"
 
-#: ../src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Farver"
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
+msgid "Split"
+msgstr "Opdel"
 
-#: ../src/commandhandler.cpp:221
-msgid "Command: /announce <msg>"
-msgstr "Kommando: /announce <besked>"
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
 
-#: ../src/commandhandler.cpp:274
-#, fuzzy
-msgid "Command: /away"
-msgstr "Kommando: /who"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
+msgstr "Vægt:"
 
-#: ../src/commandhandler.cpp:271
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Kommando: /w <spiller> <besked>"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Gem på lager"
 
-#: ../src/commandhandler.cpp:228
-msgid "Command: /clear"
-msgstr "Kommando: /clear"
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Hent fra lager"
 
-#: ../src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Kommando: /close"
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
+msgid "Drop"
+msgstr "Smid"
 
-#: ../src/commandhandler.cpp:279
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Kommando: /create <gruppe>"
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
+msgid "OK"
+msgstr "OK"
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Kommando: /exp"
+#: src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Alle"
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Kommando: /exp <regel>"
+#: src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Vælg hvor mange genstande du vil bytte."
 
-#: ../src/commandhandler.cpp:209
-msgid "Command: /help"
-msgstr "Kommando: /help"
+#: src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Vælg hvor mange genstande du vil smide."
 
-#: ../src/commandhandler.cpp:212
-msgid "Command: /help <command>"
-msgstr "Kommando: /help <kommando>"
+#: src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Vælg hvor mange genstande du vil lagre"
 
-#: ../src/gui/widgets/whispertab.cpp:88
-#, fuzzy
-msgid "Command: /ignore"
-msgstr "Kommando: /item"
+#: src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr ""
 
-#: ../src/commandhandler.cpp:233
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Kommand: /item <regel>"
+#: src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Vælg hvor mange genstande du vil opdele."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Kommand: /invite <spiller>"
+#: src/gui/itempopup.cpp:137
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Vægt: "
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Kommando: /item"
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
+msgid "Login"
+msgstr "Log Ind"
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Kommand: /item <regel>"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Remember username"
+msgstr "Husk Brugernavn"
 
-#: ../src/commandhandler.cpp:239
-msgid "Command: /join <channel>"
-msgstr "Kommando: : /join <chat-kanal>"
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "Registrer"
 
-#: ../src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Kommando: /kick <navn>"
+#: src/gui/login.cpp:62
+#, fuzzy
+msgid "Change Server"
+msgstr "Server"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Kommando: /leave"
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Fra nu af deler partyet ikke fundne ting."
 
-#: ../src/commandhandler.cpp:245
-msgid "Command: /list"
-msgstr "Kommando: /list"
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
 
-#: ../src/commandhandler.cpp:250
-msgid "Command: /me <message>"
-msgstr "Kommando: /me <besked>"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Kort"
 
-#: ../src/commandhandler.cpp:255
-msgid "Command: /msg <nick> <message>"
-msgstr "Kommando: /msg <spiller> <besked>"
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Kommando: /op <navn>"
+#: src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Venter på serveren"
 
-#: ../src/commandhandler.cpp:284
-msgid "Command: /party <nick>"
-msgstr ""
+#: src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Næste"
 
-#: ../src/commandhandler.cpp:291
-msgid "Command: /present"
-msgstr "Kommando: /present"
+#: src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Send forespørgsel"
 
-#: ../src/commandhandler.cpp:265
-msgid "Command: /q <nick>"
-msgstr "Kommando: /q <spiller>"
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: ../src/commandhandler.cpp:264
-msgid "Command: /query <nick>"
-msgstr "Kommando: /query <spilller>"
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Kommando: /quit"
+#: src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Nulstil"
 
-#: ../src/commandhandler.cpp:301
-msgid "Command: /record"
-msgstr "Kommando: /record"
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:208
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Næste"
 
-#: ../src/commandhandler.cpp:298
-msgid "Command: /record <filename>"
-msgstr "Kommando: /record <filnamn>"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Til:"
 
-#: ../src/commandhandler.cpp:312
-msgid "Command: /toggle"
-msgstr "Kommando: /toggle"
+#: src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Send"
 
-#: ../src/commandhandler.cpp:306
-msgid "Command: /toggle <state>"
-msgstr "Kommando /toggle <tilstand>"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Kunne ikke sende brevet. Afsender eller brev er ugyldigt."
 
-#: ../src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Kommando: /topic <besked>"
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
+#: src/gui/outfitwindow.cpp:70
 #, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Kommand: /item <regel>"
+msgid "Unequip first"
+msgstr "Tag af"
 
-#: ../src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Kommando: /users"
+#: src/gui/popupmenu.cpp:83
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Handler med %s"
 
-#: ../src/commandhandler.cpp:257
-msgid "Command: /w <nick> <message>"
-msgstr "Kommando: /w <spiller> <besked>"
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Angreb %+d"
 
-#: ../src/commandhandler.cpp:323
-msgid "Command: /where"
-msgstr "kommando: /where"
+#: src/gui/popupmenu.cpp:91
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Hvisk"
 
-#: ../src/commandhandler.cpp:256
-msgid "Command: /whisper <nick> <message>"
-msgstr "Kommando: /whisper <spiller> <besked>"
+#: src/gui/popupmenu.cpp:100
+#, fuzzy, c-format
+msgid "Befriend %s"
+msgstr "@@friend|Bliv ven med %s@@"
 
-#: ../src/commandhandler.cpp:328
-msgid "Command: /who"
-msgstr "Kommando: /who"
+#: src/gui/popupmenu.cpp:105
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Se bort fra"
 
-#: ../src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Udført"
+#: src/gui/popupmenu.cpp:108
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Ignorer"
 
-#: ../src/playerrelations.cpp:312
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore||Ignorer %s fuldstændigt@@"
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:117
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore||Ignorer %s fuldstændigt@@"
 
-#: ../src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Bekræft sletning af karakter"
-
-#: ../src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Bekræft:"
-
-#: ../src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Bekræftet. Venter..."
+#: src/gui/popupmenu.cpp:130
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
+msgstr "@@guild|Inviter %s med i din guild@@"
 
-#: ../src/keyboardconfig.cpp:184
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
+msgid "Invite %s to join your party"
+msgstr "@@party|Inviter %s med i din gruppe@@"
 
-#: ../src/gui/serverdialog.cpp:233
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
-msgid "Connect"
-msgstr "Opretter forbindelse..."
+msgid "Kick player"
+msgstr "Du kunne ikke sparke denne bruger af kanalen"
 
-#: ../src/client.cpp:655
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Opretter forbindelse til kort-serveren..."
+#: src/gui/popupmenu.cpp:150
+#, fuzzy, c-format
+msgid "Talk to %s"
+msgstr "@@talk|Tal til %s@@"
 
-#: ../src/client.cpp:803
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
-msgid "Connecting to the game server"
-msgstr "Opretter forbindelse til kort-serveren..."
-
-#: ../src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Opretter forbindelse..."
+msgid "Kick monster"
+msgstr "@@admin-kick|Spark monstret ud@@"
 
-#: ../src/net/tmwa/network.cpp:414
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Opretter forbindelse til kort-serveren..."
-
-#: ../src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr ""
+msgid "Add name to chat"
+msgstr "@@name|Tilføj navn til chat@@"
 
-#: ../src/gui/statuswindow.cpp:244
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Færdigheds-points: %d"
+msgid "Pick up %s"
+msgstr "Saml op"
 
-#: ../src/game.cpp:950
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
-msgid "Could Not Load Map"
-msgstr "Kunne ikke loade kortet"
-
-#: ../src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "Kunne ikke oprette gruppe."
+msgid "Add to chat"
+msgstr "@@chat|Tilføj til chat@@"
 
-#: ../src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
-msgstr ""
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Skift server"
 
-#: ../src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Kunne ikke tilslutte sig gruppen!"
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Skift karakter"
 
-#: ../src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "Kunne ikke stjæle noget som helst..."
+#: src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Stop med at  optage chat"
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Opret"
+#: src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Du er ikke igang med at optage"
 
-#: ../src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Lav en ny karakter."
+#: src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Du er allerede igang med at  optage"
 
-#: ../src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Opret en guild"
+#: src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Start optagelse"
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
-#, fuzzy
-msgid "Create Party"
-msgstr "Lav en ny karakter."
+#: src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Fejl. Klienten kan ikke optage chat."
 
-#: ../src/gui/socialwindow.cpp:507
-#, fuzzy, c-format
-msgid "Creating guild called %s."
-msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
+#: src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Optager..."
 
-#: ../src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
-msgstr ""
+#: src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Stop optagelse"
 
-#: ../src/gui/socialwindow.cpp:529
-#, c-format
-msgid "Creating party called %s."
-msgstr ""
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Bekræft:"
 
-#: ../src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:100
+msgid "Email:"
+msgstr "E-mail:"
 
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Kritisk sår"
+#: src/gui/register.cpp:166
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Brugernavnet skal mindst være %d bogstaver langt."
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/register.cpp:174
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+msgid "The username needs to be less than %d characters long."
+msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
 
-#: ../src/gui/serverdialog.cpp:234
-#, fuzzy
-msgid "Custom Server"
-msgstr "Brugerdefineret cursor"
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Adgangskoden skal mindst være %d bogstaver langt."
 
-#: ../src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "Brugerdefineret cursor"
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 
-#: ../src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
-msgstr ""
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "De indtastede adgangskoder stemmer ikke overens."
 
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr ""
+#: src/gui/serverdialog.cpp:197
+#, fuzzy
+msgid "Choose Your Server"
+msgstr "Vælg din server"
 
-#: ../src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Debug-vindue"
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Server:"
 
-#: ../src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Standard"
+#: src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Port:"
 
-#: ../src/net/tmwa/generalhandler.cpp:225
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
-msgid "Defense"
-msgstr "Forsvar:"
-
-#: ../src/resources/itemdb.cpp:54
-#, c-format
-msgid "Defense %+d"
-msgstr "Forsvar %+d"
+msgid "Server type:"
+msgstr "Server:"
 
-#: ../src/gui/setup_colors.cpp:93
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
-msgid "Delay:"
-msgstr "Forsinkelse: "
+msgid "Connect"
+msgstr "Opretter forbindelse..."
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Slet"
+#: src/gui/serverdialog.cpp:230
+#, fuzzy
+msgid "Custom Server"
+msgstr "Brugerdefineret cursor"
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Behændighed"
+#: src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Skriv både adressen og porten på serveren."
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: src/gui/serverdialog.cpp:441
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Behændighed %+d"
-
-#: ../src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Behændighed:"
-
-#: ../src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
+msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:105
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "Se bort fra"
+#: src/gui/serverdialog.cpp:447
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "Venter på serveren"
 
-#: ../src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Se bort fra"
+#: src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Du vil gerne have dine ejendele identificeret?"
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
 
-#: ../src/gui/setup_audio.cpp:43
-msgid "Download music"
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:552
 #, c-format
-msgid "Downloading server list...%2.2f%%"
+msgid "requires v%s"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
-msgid "Drop"
-msgstr "Smid"
-
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
-#, fuzzy
-msgid "Drop..."
-msgstr "Smid"
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Lyd"
 
-#: ../src/net/tmwa/generalhandler.cpp:145
-msgid "Duplicated login."
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
 msgstr ""
 
-#: ../src/client.cpp:905
-#, fuzzy
-msgid "Email Change"
-msgstr "Ændre"
+#: src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Lyd"
 
-#: ../src/net/manaserv/loginhandler.cpp:309
-#, fuzzy
-msgid "Email address already exists."
-msgstr "email-adressen er allerede benyttet af en anden bruger."
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Lydstyrke på effekter"
 
-#: ../src/client.cpp:906
-msgid "Email changed successfully!"
-msgstr ""
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Lydstyrke på musik"
 
-#: ../src/gui/register.cpp:100
-msgid "Email:"
-msgstr "E-mail:"
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Ingen tekst"
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
-#, c-format
-msgid "Emote Shortcut %d"
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Emote fejlede!"
+#: src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "SÃ¥dan ser farven ud."
 
-#: ../src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
+#: src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Farver"
 
-#: ../src/gui/setup_joystick.cpp:39
-msgid "Enable joystick"
-msgstr "Aktiver joystick"
+#: src/gui/setup_colors.cpp:72
+#, fuzzy
+msgid "Type:"
+msgstr "Type: "
 
-#: ../src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Slå handler fra/til"
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Fastlåst"
 
-#: ../src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Pulserende"
 
-#: ../src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr ""
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Regnbuefarvet"
 
-#: ../src/client.cpp:715
-msgid "Entering game world"
-msgstr ""
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Spektrum"
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
-msgid "Equip"
-msgstr "Tag på"
+#: src/gui/setup_colors.cpp:94
+#, fuzzy
+msgid "Delay:"
+msgstr "Forsinkelse: "
 
-#: ../src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
-msgstr ""
+#: src/gui/setup_colors.cpp:109
+#, fuzzy
+msgid "Red:"
+msgstr "Rød: "
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Udstyr"
+#: src/gui/setup_colors.cpp:124
+#, fuzzy
+msgid "Green:"
+msgstr "Grøn: "
 
-#: ../src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr ""
+#: src/gui/setup_colors.cpp:139
+#, fuzzy
+msgid "Blue:"
+msgstr "Blå: "
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "Fejl"
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Anvend"
 
-#: ../src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Nulstil Vinduer"
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
-msgid "Error creating updates directory!"
-msgstr "Fejl under oprettelsen af opdateringen mappen!"
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Tryk på knappen for at starte justeringen."
 
-#: ../src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Kommando: : /join <chat-kanal>"
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Justering"
 
-#: ../src/gui/serverdialog.cpp:456
-msgid "Error retreiving server list!"
-msgstr ""
+#: src/gui/setup_joystick.cpp:39
+msgid "Enable joystick"
+msgstr "Aktiver joystick"
 
-#: ../src/game.cpp:951
-#, c-format
-msgid "Error while loading %s"
-msgstr "Kunne ikke loade %s."
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: ../src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Stop"
 
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "XP-notits"
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Rotere joysticket"
 
-#: ../src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "Exp:"
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Tastatur"
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr "Fra nu af deler gruppen ikke experience points."
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Tildel"
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr "Fra nu af deler partyet experience points."
+#: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Tildel"
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr "Deling af exp kunne ikke slås til."
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Standard"
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
-#, fuzzy
-msgid "Experience sharing unknown."
-msgstr "Fra nu af deler partyet experience points."
+#: src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Tast Konfikt(er) Opdaget."
 
-#: ../src/gui/setup_video.cpp:238
-#, fuzzy
-msgid "FPS limit:"
-msgstr "FPS-grænse:"
+#: src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Navn"
 
-#: ../src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Fejlede i at tilføje genstand af en ukendt grund."
+#: src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Relation"
 
-#: ../src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-"Fejlede i at tilføje genstand. Handels partneren har ikke flere frie pladser."
+#: src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutral"
 
-#: ../src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Fejlede i at tilføje genstand. Handels partneren bære på for meget."
+#: src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Ven"
 
-#: ../src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på "
-"vinduet."
+#: src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Se bort fra"
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Karakteren kunne ikke oprettes. MÃ¥ske er navnet allerede brug."
+#: src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Ignorer"
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "Kunne ikke slette karakteren."
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
+msgid "???"
+msgstr "???"
 
-#: ../src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
+#: src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Tillad handel"
 
-#: ../src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "Kunne ikke sende brevet. Afsender eller brev er ugyldigt."
+#: src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Tillad hviskere"
 
-#: ../src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Fejl. Klienten kan ikke optage chat."
+#: src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Placer alle hviskesamtaler i en tab"
 
-#: ../src/gui/setup_video.cpp:434
+#: src/gui/setup_players.cpp:233
 #, fuzzy
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
+msgid "Show gender"
+msgstr "Vis navn"
 
-#: ../src/gui/setup_video.cpp:428
+#: src/gui/setup_players.cpp:235
 #, fuzzy
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
+msgid "Enable Chat log"
+msgstr "Kunne ikke sælge."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
-msgid "Failed to use item."
-msgstr "Du kunne ikke bruge denne genstand."
+#: src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Brugere"
 
-#: ../src/client.cpp:927
-msgid "Farewell, come back any time..."
-msgstr ""
+#: src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "NÃ¥r ignorer:"
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
-msgid "Female"
-msgstr "Kvinde"
+#: src/gui/setup_video.cpp:134
+msgid "Tiny"
+msgstr "Meget lille"
 
-#: ../src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "GÃ¥ hen hvor musen peger"
+#: src/gui/setup_video.cpp:135
+msgid "Small"
+msgstr "Lille"
 
-#: ../src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Stop med at  optage chat"
+#: src/gui/setup_video.cpp:136
+msgid "Medium"
+msgstr "Middel"
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:137
+msgid "Large"
+msgstr "Stor"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:163
+msgid "No text"
+msgstr "Ingen tekst"
 
-#: ../src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Skriftstørrelse"
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Tekst"
 
-#: ../src/commandhandler.cpp:205
-msgid "For more information, type /help <command>."
-msgstr "/help <kommando>   > Vis en detaljeret beskrivelse af <kommando>"
+#: src/gui/setup_video.cpp:165
+msgid "Bubbles, no names"
+msgstr "Bobler uden navne"
 
-#: ../src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Ven"
+#: src/gui/setup_video.cpp:166
+msgid "Bubbles with names"
+msgstr "Bobler med navne"
 
-#: ../src/gui/setup_video.cpp:219
-msgid "Full screen"
-msgstr "Fuld Skærm"
+#: src/gui/setup_video.cpp:178
+msgid "off"
+msgstr "deaktiveret"
 
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "GM-navne"
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
+msgid "low"
+msgstr "lav"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
-#, fuzzy
-msgid "Game"
-msgstr "Navn"
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
+msgid "high"
+msgstr "høj"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Game Over!"
+#: src/gui/setup_video.cpp:193
+msgid "medium"
+msgstr "mellem"
 
-#: ../src/game.cpp:169
-msgid "General"
-msgstr ""
+#: src/gui/setup_video.cpp:195
+msgid "max"
+msgstr "maks"
 
-#: ../src/gui/widgets/chattab.cpp:126
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Besked fra %s til alle:"
+#: src/gui/setup_video.cpp:217
+msgid "Full screen"
+msgstr "Fuld Skærm"
 
-#: ../src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Besked til alle."
+#: src/gui/setup_video.cpp:218
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: ../src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
-msgstr "Blev smidt af serveren!"
+#: src/gui/setup_video.cpp:219
+msgid "Custom cursor"
+msgstr "Brugerdefineret cursor"
+
+#: src/gui/setup_video.cpp:221
+msgid "Visible names"
+msgstr "Synlige navne"
 
-#: ../src/gui/setup_colors.cpp:123
+#: src/gui/setup_video.cpp:223
+msgid "Particle effects"
+msgstr "Partikeleffekter"
+
+#: src/gui/setup_video.cpp:225
 #, fuzzy
-msgid "Green:"
-msgstr "Grøn: "
+msgid "Show own name"
+msgstr "Vis navn"
 
-#: ../src/gui/setup_video.cpp:261
-msgid "Gui opacity"
-msgstr "Gennemsigtighed"
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Opret en guild"
+#: src/gui/setup_video.cpp:227
+msgid "Show pickup notification"
+msgstr "Vis besked når noget samles op"
 
-#: ../src/gui/socialwindow.cpp:143
-#, fuzzy, c-format
-msgid "Guild %s quit requested."
-msgstr "Oprettede en ny guild"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
+msgid "in chat"
+msgstr "i chat"
 
-#: ../src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Opret en guild"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
+msgid "as particle"
+msgstr "som partikeleffekt"
 
-#: ../src/gui/socialwindow.cpp:543
+#: src/gui/setup_video.cpp:236
 #, fuzzy
-msgid "Guild Name"
-msgstr "Opret en guild"
-
-#: ../src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Oprettede en ny guild"
+msgid "FPS limit:"
+msgstr "FPS-grænse:"
 
-#: ../src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
-#, fuzzy
-msgid "Guild name is missing."
-msgstr "Du glemte at skrive et navn på dit party."
+#: src/gui/setup_video.cpp:250
+msgid "Video"
+msgstr "Video"
 
-#: ../src/gui/statuswindow.cpp:203
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "HP"
-msgstr "HP:"
+msgid "Show damage"
+msgstr "Vis navn"
 
-#: ../src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+#: src/gui/setup_video.cpp:258
+msgid "Overhead text"
+msgstr ""
 
-#: ../src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "HP:"
+#: src/gui/setup_video.cpp:259
+msgid "Gui opacity"
+msgstr "Gennemsigtighed"
 
-#: ../src/gui/charcreatedialog.cpp:74
-#, fuzzy
-msgid "Hair color:"
-msgstr "HÃ¥rfarve:"
+#: src/gui/setup_video.cpp:260
+msgid "Ambient FX"
+msgstr "Omgivende FX"
 
-#: ../src/gui/charcreatedialog.cpp:77
+#: src/gui/setup_video.cpp:261
 #, fuzzy
-msgid "Hair style:"
-msgstr "Frisure:"
+msgid "Particle detail"
+msgstr "Partikeldetaljer"
 
-#: ../src/gui/help.cpp:37
-msgid "Help"
-msgstr "Hjælp"
+#: src/gui/setup_video.cpp:262
+msgid "Font size"
+msgstr "Skriftstørrelse"
 
-#: ../src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Hjælpevindue"
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
+#, fuzzy
+msgid "None"
+msgstr "Nej"
 
-#: ../src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Gem vinduer"
+#: src/gui/setup_video.cpp:426
+#, fuzzy
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
 
-#: ../src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Hmm? Hvad er det?"
+#: src/gui/setup_video.cpp:432
+#, fuzzy
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Jeg går ud fra at dette ikke gik alt for godt."
+#: src/gui/setup_video.cpp:443
+#, fuzzy
+msgid "Switching to Full Screen"
+msgstr "Skifter til fuld skærm"
 
-#: ../src/commandhandler.cpp:241
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Hvis <chat-kanal> ikke eksisterer, så bliver den oprettet."
+#: src/gui/setup_video.cpp:444
+msgid "Restart needed for changes to take effect."
+msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/gui/setup_video.cpp:458
+#, fuzzy
+msgid "Changing to OpenGL"
+msgstr "Skrifter til OpenGL"
+
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
-"Hvis <spilller>  (altså spillerens navn) indeholder mellemrum, så kan du "
-"sætter gåseøjne (\")."
 
-#: ../src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
 msgstr ""
-"Hvis det ikke var fordi du var så animeret, kunne du sikker imponere Chuck "
-"Norris."
 
-#: ../src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Hvis du er den sidste person på kanalen vil den blive slettet."
+#: src/gui/setup_video.cpp:467
+msgid "Applying change to OpenGL requires restart."
+msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: ../src/gui/popupmenu.cpp:108
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "Ignorer"
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Fra nu af deler gruppen ikke experience points."
 
-#: ../src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Ignorer"
-
-#: ../src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorerer indkomne handels anmodninger"
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
+#, fuzzy
+msgid "Screen Resolution Changed"
+msgstr "Skærmopløsning ændret"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorerer anmodninger om byttehandler."
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
+msgid "Restart your client for the change to take effect."
+msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Info"
+#: src/gui/setup_video.cpp:579
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "Indsæt en mønt for at fortsætte."
+#: src/gui/setup_video.cpp:612
+#, fuzzy
+msgid "Particle Effect Settings Changed."
+msgstr "Ændrede Partikeleffekter."
 
-#: ../src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "Utilstrækkelig HP!"
+#: src/gui/setup_video.cpp:613
+msgid "Changes will take effect on map change."
+msgstr "Ændringerne træder i kraft når du er går til et nyt kort."
 
-#: ../src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "Utilstrækkelig SP!"
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Færdigheder"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Intelligens"
+#: src/gui/skilldialog.cpp:223
+msgid "Up"
+msgstr "Op"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligens %+d"
+#: src/gui/skilldialog.cpp:269
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Færdigheds-points: %d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Intelligens:"
+#: src/gui/skilldialog.cpp:351
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Færdigheds-points: %d"
 
-#: ../src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
-msgstr ""
+#: src/gui/skilldialog.cpp:360
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Færdigheder"
 
-#: ../src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
-msgstr ""
+#: src/gui/skilldialog.cpp:442
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Niveau: %d"
 
-#: ../src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
-msgstr ""
+#: src/gui/skilldialog.cpp:453
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Niveau: %d"
 
-#: ../src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: ../src/client.cpp:1244
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
-msgid "Invalid update host: %s"
-msgstr "Ugyldig opdaterings host: "
-
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inventarliste"
+msgid "Guild %s quit requested."
+msgstr "Oprettede en ny guild"
 
-#: ../src/keyboardconfig.cpp:72
-msgid "Inventory Window"
+#: src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: ../src/localplayer.cpp:1254
-#, fuzzy
-msgid "Inventory is full."
-msgstr "Serveren er fuld"
+#: src/gui/socialwindow.cpp:154
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
-msgid "Invite"
-msgstr "Inviter en spiller"
-
-#: ../src/gui/popupmenu.cpp:130
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|Inviter %s med i din guild@@"
+msgid "Leave Guild?"
+msgstr "Opret en guild"
 
-#: ../src/gui/popupmenu.cpp:134
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|Inviter %s med i din gruppe@@"
-
-#: ../src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Invitationen er afsendt."
-
-#: ../src/gui/socialwindow.cpp:128
-#, c-format
-msgid "Invited user %s to guild %s."
-msgstr ""
+msgid "Are you sure you want to leave guild %s?"
+msgstr "ER du sikker på at du vil afslutte programmet?"
 
-#: ../src/net/tmwa/partyhandler.cpp:335
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Inviter en spiller til din gruppe"
 
-#: ../src/net/tmwa/partyhandler.cpp:340
+#: src/gui/socialwindow.cpp:218
 #, c-format
-msgid "Inviting failed, because you can't see a player called %s."
+msgid "Party %s quit requested."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Shortcut %d"
-
-#: ../src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr ""
+#: src/gui/socialwindow.cpp:232
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Inviter en spiller til din gruppe"
 
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
+#: src/gui/socialwindow.cpp:233
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
+#: src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
-msgstr ""
+#: src/gui/socialwindow.cpp:243
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "ER du sikker på at du vil afslutte programmet?"
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Fra nu af deler partyet ikke fundne ting."
+#: src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Opret en guild"
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Fra nu af deler partyet fundne ting."
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
+#, fuzzy
+msgid "Create Party"
+msgstr "Lav en ny karakter."
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "Deling af fundne ting kunne ikke slås til."
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:141
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
-msgid "Item sharing unknown."
-msgstr "Fra nu af deler partyet fundne ting."
+msgid "Invite"
+msgstr "Inviter en spiller"
 
-#: ../src/gui/statuswindow.cpp:234
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
-msgid "Job"
-msgstr "Job:"
+msgid "Leave"
+msgstr "Stor"
 
-#: ../src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Job:"
+#: src/gui/socialwindow.cpp:443
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Du har accepteret en invitation fra %s."
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
-#, c-format
-msgid "Job: %d"
-msgstr "Job: %d"
+#: src/gui/socialwindow.cpp:449
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Du har ignoreret en invitation fra %s."
 
-#: ../src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
+#: src/gui/socialwindow.cpp:462
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Du har accepteret en invitation fra %s."
 
-#: ../src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: src/gui/socialwindow.cpp:468
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Du har ignoreret en invitation fra %s."
 
-#: ../src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Tast Konfikt(er) Opdaget."
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Tastatur"
+#: src/gui/socialwindow.cpp:504
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
 
-#: ../src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Du kunne ikke sparke denne bruger af kanalen"
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:163
-#, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|Spark monstret ud@@"
+#: src/gui/socialwindow.cpp:527
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:141
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
-msgid "Kick player"
-msgstr "Du kunne ikke sparke denne bruger af kanalen"
+msgid "Guild Name"
+msgstr "Opret en guild"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Brugeren er sparket ud af kanalen"
+#: src/gui/socialwindow.cpp:542
+#, fuzzy
+msgid "Choose your guild's name."
+msgstr "Vælg din server"
 
-#: ../src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Stor"
+#: src/gui/socialwindow.cpp:554
+msgid "Received guild request, but one already exists."
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:335
-#, fuzzy
-msgid "Leave"
-msgstr "Stor"
+#: src/gui/socialwindow.cpp:559
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s har inviteret med i %s's gruppe."
 
-#: ../src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
-msgid "Leave Guild?"
-msgstr "Opret en guild"
+msgid "Accept Guild Invite"
+msgstr "Accepter invitationen"
 
-#: ../src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
+#: src/gui/socialwindow.cpp:576
+msgid "Received party request, but one already exists."
 msgstr ""
 
-#: ../src/gui/statuswindow.cpp:257
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
-msgid "Level"
-msgstr "Niveau: %d"
+msgid "You have been invited you to join a party."
+msgstr "%s har inviteret med i sin gruppe"
+
+#: src/gui/socialwindow.cpp:589
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s har inviteret med i %s's gruppe."
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/socialwindow.cpp:597
 #, c-format
-msgid "Level: %d"
-msgstr "Niveau: %d"
+msgid "%s has invited you to join their party."
+msgstr "%s har inviteret med i sin gruppe"
 
-#: ../src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
+#: src/gui/socialwindow.cpp:602
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s har inviteret med i %s's gruppe."
 
-#: ../src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Kritisk sår"
+#: src/gui/socialwindow.cpp:610
+msgid "Accept Party Invite"
+msgstr "Accepter invitationen"
 
-#: ../src/gui/userpalette.cpp:107
+#: src/gui/socialwindow.cpp:621
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "Spiller rammer monster"
+msgid "Party Name"
+msgstr "Gruppe"
 
-#: ../src/gui/userpalette.cpp:111
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
-msgid "Local Player Miss"
-msgstr "Gem bruger liste"
+msgid "Choose your party's name."
+msgstr "Vælg din server"
 
-#: ../src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
+msgid "Specials"
 msgstr ""
 
-#: ../src/client.cpp:682
-#, fuzzy
-msgid "Logging in"
-msgstr "Log Ind"
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
+#, c-format
+msgid "Level: %d"
+msgstr "Niveau: %d"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
-msgid "Login"
-msgstr "Log Ind"
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
+#, c-format
+msgid "Money: %s"
+msgstr "Penge: %s"
 
-#: ../src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#: src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "HP:"
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Det ser ud til at du fik du hoved udleveret til dig."
+#: src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Exp:"
 
-#: ../src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Held"
+#: src/gui/statuswindow.cpp:130
+msgid "MP:"
+msgstr "MP:"
 
-#: ../src/net/tmwa/generalhandler.cpp:106
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
-msgid "Luck %+d"
-msgstr "Held %+d"
+msgid "Job: %d"
+msgstr ""
+"Copy text   \t\r\n"
+"Job: %d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Held:"
+#: src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Job:"
 
-#: ../src/gui/skilldialog.cpp:455
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Niveau: %d"
+msgid "Character points: %d"
+msgstr "Du har brugt alle dine points"
 
-#: ../src/gui/skilldialog.cpp:444
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Niveau: %d"
-
-#: ../src/net/tmwa/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Attack"
-msgstr "M.Angreb:"
+msgid "Correction points: %d"
+msgstr "Færdigheds-points: %d"
 
-#: ../src/net/tmwa/generalhandler.cpp:227
-#, fuzzy
-msgid "M.Defense"
-msgstr "M.Forsvar:"
+#: src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Foreslå handel"
 
-#: ../src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
+#: src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Bekræftet. Venter..."
 
-#: ../src/resources/itemdb.cpp:56
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+#: src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Accepter handel"
 
-#: ../src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "MP:"
+#: src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Godkendt. Venter..."
 
-#: ../src/net/tmwa/chathandler.cpp:190
-#, fuzzy
-msgid "MVP player."
-msgstr "Bruger"
+#: src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Handel: Dig"
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
-msgid "Male"
-msgstr "Mand"
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Handl"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Kort"
+#: src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Tilføj"
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Navn: %s"
+msgid "You get %s"
+msgstr "Du får %s."
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Maks"
+#: src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Du giver:"
 
-#: ../src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Middel"
+#: src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Ændre"
 
-#: ../src/gui/socialwindow.cpp:157
-msgid "Member Invite to Guild"
+#: src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på "
+"vinduet."
 
-#: ../src/gui/socialwindow.cpp:236
-#, fuzzy
-msgid "Member Invite to Party"
-msgstr "/party > Inviter en spiller til din gruppe"
-
-#: ../src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
+#: src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "Du har ikke penge nok."
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Besked"
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Navn: %s"
 
-#: ../src/commandhandler.cpp:480
-msgid "Message closes chat."
-msgstr "Besked lukker chat."
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Updatere..."
 
-#: ../src/commandhandler.cpp:493
-msgid "Message now closes chat."
-msgstr "Besked lukker nu chat."
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Opretter forbindelse..."
 
-#: ../src/keyboardconfig.cpp:75
-msgid "Minimap Window"
-msgstr "Minikort"
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Spil"
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "MiniKort"
+#: src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1  Opdateringsprocessen er ikke færdiggjort"
 
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Rammer forbi"
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1  Det er varmt anbefalet at"
 
-#: ../src/gui/statuswindow.cpp:224
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
-msgid "Money"
-msgstr "Penge: %d"
+msgid "##1  you try again later."
+msgstr "##1  du prøver igen senere"
 
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
-#, c-format
-msgid "Money: %s"
-msgstr "Penge: %s"
+#: src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Udført"
 
-#: ../src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Monster rammer spiller"
+#: src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Vis alle brugere på kanalen"
 
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Monstre"
+#: src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Vælg emne for denne kanal"
 
-#: ../src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Flyt ned"
+#: src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Forlad denne kanal"
 
-#: ../src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Flyt til venstre"
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Udnævn en bruger til operator"
 
-#: ../src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Flyt til højre"
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Spark en bruger ud af kanalen"
 
-#: ../src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Flyt op"
+#: src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Kommando: /users"
 
-#: ../src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Lydstyrke på musik"
+#: src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Denne kommando viser alle brugere på kanalen"
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
-#, c-format
-msgid "Music: %s"
-msgstr ""
+#: src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Kommando: /topic <besked>"
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Denne kommando sætter kanalens emne til <besked>"
 
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPC'er"
+#: src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Kommando: /quit"
 
-#: ../src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Navn"
+#: src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Denne kommando forlader kanalen"
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Navn:"
+#: src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Hvis du er den sidste person på kanalen vil den blive slettet."
 
-#: ../src/gui/unregisterdialog.cpp:51
-#, c-format
-msgid "Name: %s"
-msgstr "Navn: %s"
+#: src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Kommando: /op <navn>"
 
-#: ../src/gui/ministatus.cpp:157
-msgid "Need"
-msgstr ""
+#: src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Denne kommando gør <navn> til operator"
 
-#: ../src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
+#: src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
-"Du glemte at skrive navnet på den bruger der skal sparkes ud af kanalen"
-
-#: ../src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
-msgstr "Du glemte at skrive navnet på den bruger der skal blive operator"
+"En operator kan gøre andre brugere til operators eller sparke dem ud af "
+"kanalen."
 
-#: ../src/game.cpp:372
-msgid "Network Error"
-msgstr "Netværksfejl"
+#: src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Kommando: /kick <navn>"
 
-#: ../src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutral"
+#: src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Denne kommando sparker <navn> ud af kanalen"
 
-#: ../src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Den nye email-adresse er ikke gyldig."
+#: src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr "Du glemte at skrive navnet på den bruger der skal blive operator"
 
-#: ../src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "De nye password stemmer ikke overens."
+#: src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr ""
+"Du glemte at skrive navnet på den bruger der skal sparkes ud af kanalen"
 
-#: ../src/net/tmwa/loginhandler.cpp:92
-#, fuzzy
-msgid "New password too short."
-msgstr "Det nye password er for kort."
+#: src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Besked til alle."
 
-#: ../src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Næste"
+#: src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Besked fra %s til alle:"
 
-#: ../src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Gå til næste chat tab"
+#: src/gui/widgets/chattab.cpp:153
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "%s hvisker: "
 
-#: ../src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Nej"
+#: src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Du kan ikke sende en tom chat-besked"
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
+#: src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
+#: src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Der er ingen tilgængelige spilservere."
-
-#: ../src/net/tmwa/generalhandler.cpp:132
-#, fuzzy
-msgid "No servers available."
-msgstr "Der er ingen tilgængelige servere"
+#: src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Lukker hviskesamtale-tabben"
 
-#: ../src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Ingen tekst"
+#: src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Kommando: /close"
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre "
-"sted."
+#: src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Denne kommando lukker den aktuelle hviskesamtale-tab"
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
-msgid "None"
-msgstr "Nej"
+msgid "Command: /ignore"
+msgstr "Kommando: /item"
 
-#: ../src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Du er ikke igang med at optage"
+#: src/gui/widgets/whispertab.cpp:90
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+"Denne kommando viser det antal af online brugere, der er online  lige nu."
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
-msgid "Not logged in."
-msgstr "Allerede logget ind"
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Denne kommando starter med at \"optage\" chat-loggen. Den gemmer en kopi i "
+"<filnavn>"
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Du har intet at sælge."
+#: src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Status"
 
-#: ../src/gui/setup_audio.cpp:94
-#, fuzzy
-msgid "Notice"
-msgstr "Ingen tekst"
+#: src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Genvej"
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
-msgid "OK"
-msgstr "OK"
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Vælg OK"
 
-#: ../src/net/manaserv/loginhandler.cpp:152
+#: src/gui/worldselectdialog.cpp:76
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Den gamle email-adresse er ikke gyldig."
+msgid "Change Login"
+msgstr "Ændre"
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
+#: src/gui/worldselectdialog.cpp:77
 #, fuzzy
-msgid "Old password incorrect."
-msgstr "Det gamle password var ikke korrekt."
+msgid "Choose World"
+msgstr "Vælg din server"
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr ""
+#: src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Flyt op"
 
-#: ../src/net/tmwa/gamehandler.cpp:87
-#, c-format
-msgid "Online users: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Flyt ned"
 
-#: ../src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Flyt til venstre"
 
-#: ../src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
+#: src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Flyt til højre"
 
-#: ../src/main.cpp:43
-msgid "Options:"
-msgstr "Indstillinger:"
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Angrib"
 
-#: ../src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Spiller rammer monster"
+#: src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Vælg modstander og angrib"
 
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Andre spilleres navne"
+#: src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Smiley"
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Snak"
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr ""
+#: src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Stop angreb"
 
-#: ../src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:48
 #, fuzzy
-msgid "Outfits Window"
-msgstr "Statsvindue"
-
-#: ../src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr ""
+msgid "Target Monster"
+msgstr "Vælg nærmeste monster som ny modstander"
 
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Eget navn"
+#: src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "Vælg NPC som ny modstander"
 
-#: ../src/gui/setup_video.cpp:615
-#, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Ændrede Partikeleffekter."
+#: src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Vælg spiller som ny modstander"
 
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Partikeleffekter"
+#: src/keyboardconfig.cpp:51
+msgid "Pickup"
+msgstr "Saml op"
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Partikeleffekter"
+#: src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Gem vinduer"
 
-#: ../src/gui/setup_video.cpp:263
-#, fuzzy
-msgid "Particle detail"
-msgstr "Partikeldetaljer"
+#: src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Sid"
 
-#: ../src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Partikeldetaljer"
+#: src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Gem skærmbillede som fil"
 
-#: ../src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Partikeleffekter"
+#: src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Slå handler fra/til"
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Gruppe"
+#: src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "GÃ¥ hen hvor musen peger"
 
-#: ../src/gui/socialwindow.cpp:222
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
-msgid "Party %s quit requested."
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Gruppe"
-
-#: ../src/gui/socialwindow.cpp:629
-#, fuzzy
-msgid "Party Name"
-msgstr "Gruppe"
-
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Du glemte at skrive et navn på dit party."
-
-#: ../src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Du har nu oprettet gruppen."
+msgid "Item Shortcut %d"
+msgstr "Shortcut %d"
 
-#: ../src/gui/beingpopup.cpp:76
-#, fuzzy, c-format
-msgid "Party: %s"
-msgstr "Gruppe (%s)"
+#: src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Hjælpevindue"
 
-#: ../src/client.cpp:885
-#, fuzzy
-msgid "Password Change"
-msgstr "Adgangskode:"
+#: src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Statsvindue"
 
-#: ../src/client.cpp:886
-msgid "Password changed successfully!"
+#: src/keyboardconfig.cpp:71
+msgid "Inventory Window"
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Adgangskode:"
-
-#: ../src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "De indtastede adgangskoder stemmer ikke overens."
-
-#: ../src/gui/popupmenu.cpp:188
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "Saml op"
+#: src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:52
-msgid "Pickup"
-msgstr "Saml op"
+#: src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Færdigheds-vindue"
 
-#: ../src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "Opsamlingsnotits"
+#: src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Minikort"
 
-#: ../src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Spil"
+#: src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Chat-vindue"
 
-#: ../src/commandhandler.cpp:545
-msgid "Player already ignored!"
+#: src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
 msgstr ""
 
-#: ../src/commandhandler.cpp:554
-#, fuzzy
-msgid "Player could not be ignored!"
-msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
+#: src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Opsætnings-vindue"
 
-#: ../src/commandhandler.cpp:576
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
+#: src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Debug-vindue"
 
-#: ../src/net/manaserv/charhandler.cpp:193
+#: src/keyboardconfig.cpp:79
 #, fuzzy
-msgid "Player deleted."
-msgstr "Karakteren er slettet"
+msgid "Social Window"
+msgstr "Færdigheds-vindue"
 
-#: ../src/commandhandler.cpp:574
-msgid "Player no longer ignored!"
+#: src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
 msgstr ""
 
-#: ../src/commandhandler.cpp:552
+#: src/keyboardconfig.cpp:81
 #, fuzzy
-msgid "Player successfully ignored!"
-msgstr "Du har nu oprettet gruppen."
+msgid "Outfits Window"
+msgstr "Statsvindue"
 
-#: ../src/commandhandler.cpp:569
-msgid "Player wasn't ignored!"
+#: src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Brugere"
-
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Spiller rammer monster"
+#: src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
+msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
-msgid "Please distribute %d points"
-msgstr "Du mangler at fordele %d points"
+msgid "Emote Shortcut %d"
+msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Du skal fjerne %d points"
+#: src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Slå chat til eller fra"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
-msgid "Please specify a name."
-msgstr ""
+#: src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Scroll chat op"
 
-#: ../src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Skriv både adressen og porten på serveren."
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Scroll chat ned"
 
-#: ../src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Giften havde ingen effekt..."
+#: src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "GÃ¥ til sidste chat tab"
 
-#: ../src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Port:"
+#: src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Gå til næste chat tab"
 
-#: ../src/gui/serverdialog.cpp:452
-msgid "Preparing download"
+#: src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "Vælg OK"
+
+#: src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
 msgstr ""
 
-#: ../src/gui/chat.cpp:307
-#, fuzzy, c-format
-msgid "Present: %s; %d players are present."
-msgstr "Der er %d spillere til stede"
+#: src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Tryk OK for at genopstå"
+#: src/keyboardconfig.cpp:183
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Tryk på knappen for at starte justeringen."
+#: src/localplayer.cpp:985
+msgid "Unable to pick up item."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "GÃ¥ til sidste chat tab"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:994
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Du samlede %s [@@%d|%s@@] op."
+msgstr[1] "Du samlede %s [@@%d|%s@@] op."
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Pris: %s / Total: %s"
+#: src/main.cpp:42
+msgid "mana [options] [mana-file]"
+msgstr ""
 
-#: ../src/playerrelations.cpp:326
-msgid "Print '...'"
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
-#: ../src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Foreslå handel"
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Pulserende"
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr "Placer alle hviskesamtaler i en tab"
+#: src/main.cpp:47
+msgid "Options:"
+msgstr "Indstillinger:"
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Afslut"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version : Vis versionsnummer"
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Regnbuefarvet"
+#: src/main.cpp:49
+#, fuzzy
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help : Vis denne hjælpebesked"
 
-#: ../src/gui/socialwindow.cpp:556
-msgid "Received guild request, but one already exists."
-msgstr ""
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : Ønsket konfigurationsfil"
 
-#: ../src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr ""
+#: src/main.cpp:51
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username : Anvend dette brugernavn"
 
-#: ../src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Optager..."
+#: src/main.cpp:52
+#, fuzzy
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password : Anvend dette password"
 
-#: ../src/gui/setup_colors.cpp:108
+#: src/main.cpp:53
 #, fuzzy
-msgid "Red:"
-msgstr "Rød: "
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character : Log på som denne karakter"
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
-msgid "Register"
-msgstr "Registrer"
+#: src/main.cpp:54
+#, fuzzy
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server : Login server navn or IP"
 
-#: ../src/gui/login.cpp:129
+#: src/main.cpp:55
 #, fuzzy
-msgid "Registration disabled"
-msgstr "Fra nu af deler partyet ikke fundne ting."
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port : Login server port"
 
-#: ../src/net/tmwa/loginhandler.cpp:165
+#: src/main.cpp:56
 #, fuzzy
-msgid "Rejected from server."
-msgstr "Adgang til serveren blev nægtet."
+msgid "     --update-host    : Use this update host"
+msgstr "  -u --skip-update : Undlad at hente updateringer"
 
-#: ../src/gui/socialwindow.cpp:472
-#, fuzzy, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Du har ignoreret en invitation fra %s."
+#: src/main.cpp:57
+#, fuzzy
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default : Vælg karakter-server og karakter"
 
-#: ../src/gui/socialwindow.cpp:453
-#, fuzzy, c-format
-msgid "Rejected party invite from %s."
-msgstr "Du har ignoreret en invitation fra %s."
+#: src/main.cpp:59
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Undlad at hente updateringer"
 
-#: ../src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Relation"
+#: src/main.cpp:60
+#, fuzzy
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data : Directory med data til spillet"
 
-#: ../src/gui/login.cpp:60
+#: src/main.cpp:61
 #, fuzzy
-msgid "Remember username"
-msgstr "Husk Brugernavn"
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir : Directory der skal bruges som hjemmekatalog"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Anmodning om byttehandel."
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Ønsket konfigurationsfil"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/main.cpp:63
 #, fuzzy
-msgid "Request to quit denied!"
-msgstr "Anmodning om byttehandel."
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir : Directory der skal bruges som hjemmekatalog"
 
-#: ../src/client.cpp:774
+#: src/main.cpp:65
 #, fuzzy
-msgid "Requesting characters"
-msgstr "Vælg Karakter"
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl : Start mana uden OpenGL"
 
-#: ../src/client.cpp:858
-msgid "Requesting registration details"
-msgstr ""
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Du er død."
 
-#: ../src/commandhandler.cpp:436
-#, c-format
-msgid "Requesting to join channel %s."
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
+"Vi beklager at måtte informere dig, om at din karakter var dræbt i kamp."
 
-#: ../src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Nulstil"
-
-#: ../src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Nulstil Vinduer"
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Du er ikke så levende som du engang har været."
 
-#: ../src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr "Ændringerne kræver at du genstarter klienten."
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Manden med leen griber ud efter din sjæl."
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "Ændringerne kræver at du genstarter klienten."
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Game Over!"
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Hent fra lager"
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre "
+"sted."
 
-#: ../src/commandhandler.cpp:489
-msgid "Return now toggles chat."
-msgstr "Enter bringer nu focus på chatten."
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr "Din plan om at smadre fjendens våben, ved at benytte din hals fejlede."
 
-#: ../src/commandhandler.cpp:480
-msgid "Return toggles chat."
-msgstr "Retur bringer focus på chatten."
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Jeg går ud fra at dette ikke gik alt for godt."
 
-#: ../src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Rotere joysticket"
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Du vil gerne have dine ejendele identificeret?"
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Desværre, blev der aldrig fundet noget spor efter dig..."
 
-#: ../src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Gemningen af skærmbilledet fejlede!"
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Udslettet."
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Det ser ud til at du fik du hoved udleveret til dig."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny."
+
+#: src/net/manaserv/beinghandler.cpp:323
 #, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Skærmopløsning ændret"
+msgid "Press OK to respawn."
+msgstr " Tryk OK for at genopstå"
 
-#: ../src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Gem skærmbillede som fil"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Du er død"
 
-#: ../src/game.cpp:333
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 #, fuzzy
-msgid "Screenshot saved as "
-msgstr "Skærmbillede gemt under ~/"
+msgid "Not logged in."
+msgstr "Allerede logget ind"
 
-#: ../src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Scroll chat ned"
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Scroll chat op"
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Det ser ud til at du ikke har nok penge... :-)"
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Brugernavnet er allerede benyttet af en anden bruger."
 
-#: ../src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "Vælg OK"
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
 
-#: ../src/gui/worldselectdialog.cpp:71
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
-msgid "Select World"
-msgstr "Vælg OK"
+msgid "Character's stats are too high."
+msgstr "Du har brugt alle dine points"
 
-#: ../src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Vælg hvor mange genstande du vil smide."
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Du har brugt alle dine points"
 
-#: ../src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: ../src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Vælg hvor mange genstande du vil opdele."
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Ukendt fejl"
 
-#: ../src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Vælg hvor mange genstande du vil lagre"
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
 
-#: ../src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Vælg hvor mange genstande du vil bytte."
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Karakteren er slettet"
 
-#: ../src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Sælg"
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Ukendt fejl"
 
-#: ../src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Send"
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Der er ingen tilgængelige spilservere."
 
-#: ../src/gui/serverdialog.cpp:211
-#, fuzzy
-msgid "Server type:"
-msgstr "Server:"
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Server:"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Spiller rammer monster"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Opsætning"
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Kommando: : /join <chat-kanal>"
 
-#: ../src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Opsætnings-vindue"
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
 
-#: ../src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Lydstyrke på effekter"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#: ../src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "butik"
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s blev medlem af gruppen."
 
-#: ../src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Genvej"
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
-msgid "Show IP: Off"
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
-msgid "Show IP: On"
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
-msgid "Show damage"
-msgstr "Vis navn"
+msgid "Unknown channel event."
+msgstr "Ukendt kommando"
 
-#: ../src/gui/setup_players.cpp:232
-#, fuzzy
-msgid "Show gender"
-msgstr "Vis navn"
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Oprettede en ny guild"
 
-#: ../src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show own name"
-msgstr "Vis navn"
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
 
-#: ../src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
-msgstr "Vis besked når noget samles op"
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Invitationen er afsendt."
 
-#: ../src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "Sid"
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Sæt dig fejlede!"
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
 
-#: ../src/gui/skilldialog.cpp:362
-#, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Færdigheder"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Forkert magic_token"
 
-#: ../src/gui/skilldialog.cpp:353
-#, fuzzy, c-format
-msgid "Skill Set %d"
-msgstr "Færdigheds-points: %d"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Allerede logget ind"
 
-#: ../src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Færdigheds-vindue"
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Kontoen er slettet"
 
-#: ../src/gui/skilldialog.cpp:271
-#, fuzzy, c-format
-msgid "Skill points available: %d"
-msgstr "Færdigheds-points: %d"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "De nye password stemmer ikke overens."
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Færdigheder"
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Det gamle password var ikke korrekt."
 
-#: ../src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Kontoen er ikke tilsluttet. Du skal først logge ind."
 
-#: ../src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Lille"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Den nye email-adresse er ikke gyldig."
 
-#: ../src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Smiley"
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Den gamle email-adresse er ikke gyldig."
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
-msgid "Social"
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "Den nye  email-adresse eksisterer allerede."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:80
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Social Window"
-msgstr "Færdigheds-vindue"
+msgid "Client version is too old."
+msgstr "Du bruger en for gammel version af klienten."
 
-#: ../src/gui/setup_video.cpp:582
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Forkert brugernavn eller password"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Kontoen er slettet"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:136
+#: src/net/manaserv/loginhandler.cpp:303
 #, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "En anden bruger forsøger at logge ind på denne brugerkonto"
+msgid "Wrong username, password or email address."
+msgstr "Forkert brugernavn, password eller email-adresse."
 
-#: ../src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Lyd"
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Brugernavnet er allerede benyttet af en anden bruger."
 
-#: ../src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "email-adressen er allerede benyttet af en anden bruger."
 
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
-msgid "Specials"
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
 msgstr ""
 
-#: ../src/gui/specialswindow.cpp:174
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Spektrum"
-
-#: ../src/net/tmwa/generalhandler.cpp:142
-#, fuzzy
-msgid "Speed hack detected."
-msgstr "Dit hastighedshack blev opdaget af serveren."
+msgid "%s joined the party."
+msgstr "%s blev medlem af gruppen."
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
-msgid "Split"
-msgstr "Opdel"
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s afviste din invitation."
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
-msgstr ""
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Kan modtager anmodninger om byttehandler."
 
-#: ../src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Start optagelse"
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorerer anmodninger om byttehandler."
 
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Fastlåst"
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Anmodning om byttehandel."
 
-#: ../src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Status"
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s vil gerne handle med dig. Accepterer du?"
 
-#: ../src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Statsvindue"
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Handler med %s"
 
-#: ../src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Stop"
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Handel annulleret."
 
-#: ../src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Stop angreb"
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Handel er komplet."
 
-#: ../src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Stop optagelse"
+#: src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Du kunne ikke sparke denne bruger af kanalen"
 
-#: ../src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Opbevaret"
+#: src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Brugeren er sparket ud af kanalen"
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
-msgid "Store"
-msgstr "Gem på lager"
+#: src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Du har intet at sælge."
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Styrke"
+#: src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Tak for købet."
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Styrke %+d"
+#: src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Du kan ikke købe."
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Styrke:"
+#: src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Tak for en god handel."
 
-#: ../src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Send forespørgsel"
+#: src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Kunne ikke sælge."
 
-#: ../src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: ../src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Skift karakter"
-
-#: ../src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Skift server"
+#: src/net/tmwa/charserverhandler.cpp:107
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Kan ikke bruge denne ID"
 
-#: ../src/gui/setup_video.cpp:445
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Switching to Full Screen"
-msgstr "Skifter til fuld skærm"
+msgid "Unknown char-server failure."
+msgstr "Ukendt fejl"
 
-#: ../src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Snak"
+#: src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Karakteren kunne ikke oprettes. MÃ¥ske er navnet allerede brug."
 
-#: ../src/gui/popupmenu.cpp:150
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@talk|Tal til %s@@"
+#: src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Karakteren er slettet"
 
-#: ../src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Vælg modstander og angrib"
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Kunne ikke slette karakteren."
 
-#: ../src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "Target Monster"
-msgstr "Vælg nærmeste monster som ny modstander"
+#: src/net/tmwa/charserverhandler.cpp:266
+msgid "Strength:"
+msgstr "Styrke:"
 
-#: ../src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "Vælg NPC som ny modstander"
+#: src/net/tmwa/charserverhandler.cpp:267
+msgid "Agility:"
+msgstr "Adræthed:"
 
-#: ../src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Vælg spiller som ny modstander"
+#: src/net/tmwa/charserverhandler.cpp:268
+msgid "Vitality:"
+msgstr "Helbred:"
 
-#: ../src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Tekst"
+#: src/net/tmwa/charserverhandler.cpp:269
+msgid "Intelligence:"
+msgstr "Intelligens:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Tak for købet."
+#: src/net/tmwa/charserverhandler.cpp:270
+msgid "Dexterity:"
+msgstr "Behændighed:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Tak for en god handel."
+#: src/net/tmwa/charserverhandler.cpp:271
+msgid "Luck:"
+msgstr "Held:"
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Manden med leen griber ud efter din sjæl."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Beskeden kunne ikke sendes. Modtageren er ikke logget på."
 
-#: ../src/game.cpp:368
-#, fuzzy
-msgid "The connection to the server was lost."
-msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: ../src/gui/changeemaildialog.cpp:141
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
-msgid "The email address entries mismatch."
-msgstr "Den nye  email-adresse eksisterer allerede."
+msgid "MVP player."
+msgstr "Bruger"
 
-#: ../src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "Den nye  email-adresse eksisterer allerede."
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Serveren understøtter ikke kanaler!"
 
-#: ../src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "Brugernavnet skal mindst være %d bogstaver langt."
+#: src/net/tmwa/gamehandler.cpp:88
+#, c-format
+msgid "Online users: %d"
+msgstr ""
 
-#: ../src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Game"
+msgstr "Navn"
 
-#: ../src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
-msgstr ""
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Anmodning om byttehandel."
 
-#: ../src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "Adgangskoden skal mindst være %d bogstaver langt."
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr "Styrke %+d"
 
-#: ../src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr "Adræthed %+d"
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "Adgangskoden skal mindst være %d bogstaver langt."
+msgid "Vitality %+d"
+msgstr "Helbred %+d"
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
+msgid "Intelligence %+d"
+msgstr "Intelligens %+d"
 
-#: ../src/gui/register.cpp:166
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "Brugernavnet skal mindst være %d bogstaver langt."
+msgid "Dexterity %+d"
+msgstr "Behændighed %+d"
 
-#: ../src/gui/register.cpp:174
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
+msgid "Luck %+d"
+msgstr "Held %+d"
 
-#: ../src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
-msgid "This account is already logged in."
-msgstr "Der er allerede logget en bruger ind på denne  brugerkonto"
+msgid "Authentication failed."
+msgstr "Godkendelse fejlede"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:81
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Denne kommando får dig til at forlade din gruppe"
-
-#: ../src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Denne kommando får dig til at forlade din gruppe"
-
-#: ../src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "Denne kommando viser hvorvidt gruppen deler experience points."
+msgid "No servers available."
+msgstr "Der er ingen tilgængelige servere"
 
-#: ../src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr "Denne kommando ændrer hvordan gruppen deler fundne ting."
+#: src/net/tmwa/generalhandler.cpp:139
+#, fuzzy
+msgid "Someone else is trying to use this account."
+msgstr "En anden bruger forsøger at logge ind på denne brugerkonto"
 
-#: ../src/commandhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Denne kommando sætter kanalens emne til <besked>"
+msgid "This account is already logged in."
+msgstr "Der er allerede logget en bruger ind på denne  brugerkonto"
 
-#: ../src/commandhandler.cpp:229
-msgid "This command clears the chat log of previous chat."
-msgstr "Denne kommando rydder chat loggen"
+#: src/net/tmwa/generalhandler.cpp:145
+#, fuzzy
+msgid "Speed hack detected."
+msgstr "Dit hastighedshack blev opdaget af serveren."
 
-#: ../src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "Denne kommando lukker den aktuelle hviskesamtale-tab"
+#: src/net/tmwa/generalhandler.cpp:148
+msgid "Duplicated login."
+msgstr ""
 
-#: ../src/commandhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Disse kommandoer opretter en gruppe ved navn <gruppe>"
-
-#: ../src/commandhandler.cpp:210
-msgid "This command displays a list of all commands available."
-msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
+msgid "Unknown connection error."
+msgstr "Kunne ikke forbinde til serveren"
 
-#: ../src/commandhandler.cpp:213
-msgid "This command displays help on <command>."
-msgstr "Denne kommando viser hjælp for <kommando>"
+#: src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Blev smidt af serveren!"
 
-#: ../src/commandhandler.cpp:324
-msgid "This command displays the name of the current map."
-msgstr "Denne kommando viser det nuværende bane navn."
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Styrke"
 
-#: ../src/commandhandler.cpp:329
-msgid "This command displays the number of players currently online."
-msgstr ""
-"Denne kommando viser det antal af online brugere, der er online  lige nu."
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Adræthed"
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr "Denne kommando hvorvidt gruppen deler experience points."
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Helbred"
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr "Denne kommando viser hvorvidt gruppen deler fundne ting."
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Intelligens"
 
-#: ../src/commandhandler.cpp:313
-msgid "This command displays the return toggle status."
-msgstr "Denne kommando viser fokusering af chat vinduets status."
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Behændighed"
 
-#: ../src/commandhandler.cpp:302
-msgid "This command finishes a recording session."
-msgstr "Denne kommando stopper med at optage chatten."
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Held"
 
-#: ../src/commandhandler.cpp:292
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"Denne kommando finder en liste over brugere, der er inden for en "
-"lytteradius, og sender listen til enten record loggen, hvis du optager, "
-"ellers er det chat loggen."
+#: src/net/tmwa/generalhandler.cpp:238
+#, fuzzy
+msgid "Defense"
+msgstr "Forsvar:"
 
-#: ../src/commandhandler.cpp:234
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr ""
-"Denne kommando viser det antal af online brugere, der er online  lige nu."
+msgid "M.Attack"
+msgstr "M.Angreb:"
 
-#: ../src/gui/widgets/whispertab.cpp:89
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr ""
-"Denne kommando viser det antal af online brugere, der er online  lige nu."
+msgid "M.Defense"
+msgstr "M.Forsvar:"
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Denne kommando inviterer <spiller> til din gruppe."
+#: src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% præcission:"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Denne kommando inviterer <spiller> til din gruppe."
+#: src/net/tmwa/generalhandler.cpp:242
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% Undgå angreb."
 
-#: ../src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Denne kommando forlader kanalen"
+#: src/net/tmwa/generalhandler.cpp:243
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "Kritisk sår"
 
-#: ../src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Denne kommando gør <navn> til operator"
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Opret en guild"
 
-#: ../src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Denne kommando sparker <navn> ud af kanalen"
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Vis denne hjælpebesked."
 
-#: ../src/commandhandler.cpp:240
-msgid "This command makes you enter <channel>."
-msgstr "Denne kommando tilmelder dig til <chat-kanal>"
+#: src/net/tmwa/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Inviter en spiller med i din gruppe"
 
-#: ../src/commandhandler.cpp:223
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Denne kommando sender beskeden <besked> til alle brugere online."
+#: src/net/tmwa/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/invite > Forlad den gruppe du er med i"
 
-#: ../src/commandhandler.cpp:258
-msgid "This command sends the text <message> to <nick>."
-msgstr "Denne kommando sender <besked> til <spiller>"
+#: src/net/tmwa/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Spark en spiller ud a din gruppe"
 
-#: ../src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Denne kommando sætter kanalens emne til <besked>"
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Kommand: /invite <spiller>"
 
-#: ../src/commandhandler.cpp:307
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Denne kommando bestemmer om retur, skal bruges til at fokusere på chat "
-"loggen, ellerom chat om chat loggen, automatisk skal slå fra."
+#: src/net/tmwa/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Denne kommando inviterer <spiller> til din gruppe."
 
-#: ../src/commandhandler.cpp:246
-msgid "This command shows a list of all channels."
-msgstr "Denne kommando viser en liste over alle chat-kanaler."
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Kommando: /leave"
 
-#: ../src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Denne kommando viser alle brugere på kanalen"
+#: src/net/tmwa/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Denne kommando får dig til at forlade din gruppe"
 
-#: ../src/commandhandler.cpp:299
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr ""
-"Denne kommando starter med at \"optage\" chat-loggen. Den gemmer en kopi i "
-"<filnavn>"
+#: src/net/tmwa/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Du glemte at skrive et navn på dit party."
 
-#: ../src/commandhandler.cpp:318
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:95
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
 msgstr ""
-"Denne kommando starter med at \"optage\" chat-loggen. Den gemmer en kopi i "
-"<filnavn>"
 
-#: ../src/commandhandler.cpp:251
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Denne kommando fortæller andre at du er (eller gør) <besked>"
+#: src/net/tmwa/guildhandler.cpp:306
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s er nu medlem af din gruppe."
 
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
+#: src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
 msgstr ""
 
-#: ../src/commandhandler.cpp:266
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/net/tmwa/guildhandler.cpp:316
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Ukendt invitations-svar fra %s."
+
+#: src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
 msgstr ""
-"Denne kommando opretter en ny tab med privat samtale mellem dig og <nick>."
 
-#: ../src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "SÃ¥dan ser farven ud."
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Gruppe"
 
-#: ../src/net/tmwa/loginhandler.cpp:179
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "Dette brugernavn er allerede taget."
+#: src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Inviter en spiller med i din gruppe"
 
-#: ../src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Meget lille"
+#: src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/invite > Forlad den gruppe du er med i"
 
-#: ../src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "Til:"
+#: src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Spark en spiller ud a din gruppe"
 
-#: ../src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr "Slå chat til eller fra"
+#: src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Vis/ret hvordan gruppen deler fundne tin"
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
+#: src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/item > Vis/ret hvordan partyet deler exp"
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Handl"
+#: src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Denne kommando får dig til at forlade din gruppe"
 
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Handel annulleret."
+#: src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Kommand: /item <regel>"
 
-#: ../src/net/tmwa/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Handlen blev annulleret af en ukendt grund."
+#: src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr "Denne kommando ændrer hvordan gruppen deler fundne ting."
 
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Handel er komplet."
+#: src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"Hvis <regel> er \"1\", \"yes\", eller \"true\" så deler gruppen alle fundne "
+"ting, men hvis <regel> er \"0\", \"no\", eller \"false\" deler gruppen ikke."
 
-#: ../src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Handel fejlede!"
+#: src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Kommando: /item"
 
-#: ../src/net/tmwa/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Byttehandel med %s blev afbrudt."
+#: src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr "Denne kommando viser hvorvidt gruppen deler fundne ting."
 
-#: ../src/gui/popupmenu.cpp:83
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "Handler med %s"
+#: src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Kommando: /exp <regel>"
 
-#: ../src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Handel: Dig"
+#: src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr "Denne kommando viser hvorvidt gruppen deler experience points."
 
-#: ../src/net/tmwa/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Byttehandel: %s og dig."
+#: src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"Hvis <regel> er \"1\", \"yes\", eller \"true\" så deler gruppen experience, "
+"men hvis <regel> er \"0\", \"no\", eller \"false\" deler gruppen ikke "
+"experience."
 
-#: ../src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Du kan ikke handle. Karakteren findes ikke."
+#: src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Kommando: /exp"
 
-#: ../src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Du kan ikke handle. Handle partneren er for langt væk."
+#: src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Denne kommando hvorvidt gruppen deler experience points."
 
-#: ../src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Handler med %s"
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Fra nu af deler partyet fundne ting."
 
-#: ../src/gui/setup_video.cpp:477
-#, fuzzy
-msgid "Transparency disabled"
-msgstr "Fra nu af deler gruppen ikke experience points."
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Fra nu af deler partyet ikke fundne ting."
 
-#: ../src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
-msgstr ""
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "Deling af fundne ting kunne ikke slås til."
 
-#: ../src/localplayer.cpp:1251
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
-msgid "Tried to pick up nonexistent item."
-msgstr "Du kunne ikke bruge denne genstand."
+msgid "Item sharing unknown."
+msgstr "Fra nu af deler partyet fundne ting."
 
-#: ../src/commandhandler.cpp:335
-msgid "Type /help for a list of commands."
-msgstr "Skriv /help for at få en liste med kommandoer"
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Fra nu af deler partyet experience points."
 
-#: ../src/gui/changeemaildialog.cpp:51
-#, fuzzy
-msgid "Type new email address twice:"
-msgstr "Skriv den nye email-adresse to gange"
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr "Fra nu af deler gruppen ikke experience points."
 
-#: ../src/gui/changepassworddialog.cpp:63
-#, fuzzy
-msgid "Type new password twice:"
-msgstr "Skriv den nye email-adresse to gange"
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "Deling af exp kunne ikke slås til."
 
-#: ../src/gui/setup_colors.cpp:71
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
-msgid "Type:"
-msgstr "Type: "
+msgid "Experience sharing unknown."
+msgstr "Fra nu af deler partyet experience points."
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Du kan ikke købe."
+#: src/net/tmwa/inventoryhandler.cpp:285
+msgid "Failed to use item."
+msgstr "Du kunne ikke bruge denne genstand."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: ../src/net/tmwa/network.cpp:345
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Kunne ikke sælge."
-
-#: ../src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Kunne ikke sælge."
-
-#: ../src/net/tmwa/inventoryhandler.cpp:418
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:90
-#, fuzzy
-msgid "Unassign"
-msgstr "Tildel"
-
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
-msgid "Unequip"
-msgstr "Tag af"
-
-#: ../src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "Tag af"
-
-#: ../src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "En besked om at afbryde byttehandlen blev ikke opfattet."
-
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr ""
+#: src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Brugernavnet eksisterer ikke. log venligst ind igen."
 
-#: ../src/net/net.cpp:145
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Ukendt genstand"
+msgid "New password too short."
+msgstr "Det nye password er for kort."
 
-#: ../src/net/manaserv/chathandler.cpp:327
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
-msgid "Unknown channel event."
-msgstr "Ukendt kommando"
+msgid "Unregistered ID."
+msgstr "Frameld"
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Ukendt fejl"
-
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
-msgid "Unknown command."
-msgstr "Ukendt kommando"
+msgid "Wrong password."
+msgstr "Forkert brugernavn eller password"
 
-#: ../src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
-msgid "Unknown connection error."
-msgstr "Kunne ikke forbinde til serveren"
-
-#: ../src/net/manaserv/charhandler.cpp:208
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Ukendt fejl"
+msgid "Account expired."
+msgstr "Kontoen er slettet"
 
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
-msgid "Unknown error."
-msgstr "Ukendt fejl"
+msgid "Rejected from server."
+msgstr "Adgang til serveren blev nægtet."
 
-#: ../src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
-msgid "Unknown guild invite response."
-msgstr "Ukendt invitations-svar fra %s."
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr "Du er blevet bandlyst permanent fra spillet. Kontakt en GM."
 
-#: ../src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
-msgid "Unknown invite response for %s."
-msgstr "Ukendt invitations-svar fra %s."
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Du er blevet bandlyst fra spillet indtil %s. Kontakt venligst en GM i "
+"forummet."
 
-#: ../src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Ukendt genstand"
+#: src/net/tmwa/loginhandler.cpp:179
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Dette brugernavn er allerede taget."
 
-#: ../src/localplayer.cpp:1258
-msgid "Unknown problem picking up item."
+#: src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Frameld"
-
-#: ../src/client.cpp:926
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
-msgid "Unregister Successful"
-msgstr "Frameld"
+msgid "Unable to resolve host \""
+msgstr "Kunne ikke sælge."
 
-#: ../src/net/tmwa/loginhandler.cpp:156
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
-msgid "Unregistered ID."
-msgstr "Frameld"
+msgid "Connection to server terminated. "
+msgstr "Opretter forbindelse til kort-serveren..."
 
-#: ../src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Op"
+#: src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Kunne ikke oprette gruppe."
 
-#: ../src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Updatere..."
+#: src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Du har nu oprettet gruppen."
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
-msgid "Use"
-msgstr "Brug"
+#: src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s er allerede medlem af en gruppe."
 
-#: ../src/net/tmwa/guildhandler.cpp:305
-#, fuzzy
-msgid "User is now part of your guild."
+#: src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s afviste din invitation."
+
+#: src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
 msgstr "%s er nu medlem af din gruppe."
 
-#: ../src/net/tmwa/guildhandler.cpp:300
-msgid "User rejected guild invite."
-msgstr ""
+#: src/net/tmwa/partyhandler.cpp:131
+#, c-format
+msgid "Unknown invite response for %s."
+msgstr "Ukendt invitations-svar fra %s."
 
-#: ../src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Brugernavnet er allerede benyttet af en anden bruger."
+#: src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Du har foradt gruppen."
 
-#: ../src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Video"
+#: src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s har forladt gruppen."
 
-#: ../src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Synlige navne"
+#: src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Et ukendt medlem forsøgte at sige: %s"
 
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Helbred"
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
+#: src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
-msgid "Vitality %+d"
-msgstr "Helbred %+d"
+msgid "%s is not in your party!"
+msgstr "%s er ikke medlem af din gruppe!"
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Helbred:"
+#: src/net/tmwa/playerhandler.cpp:100
+msgid "Insert coin to continue."
+msgstr "Indsæt en mønt for at fortsætte."
 
-#: ../src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "Venter på serveren"
+#: src/net/tmwa/playerhandler.cpp:118
+msgid "You're not dead yet. You're just resting."
+msgstr "Du er ikke død endnu. Du hviler dig bare."
 
-#: ../src/gui/serverdialog.cpp:448
-#, fuzzy
-msgid "Waiting for server..."
-msgstr "Venter på serveren"
+#: src/net/tmwa/playerhandler.cpp:119
+msgid "You are no more."
+msgstr "Du er ikke mere."
 
-#: ../src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "Warp mislykkede..."
+#: src/net/tmwa/playerhandler.cpp:120
+msgid "You have ceased to be."
+msgstr "Du er holdt op med at være til."
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"Vi beklager at måtte informere dig, om at din karakter var dræbt i kamp."
+#: src/net/tmwa/playerhandler.cpp:121
+msgid "You've expired and gone to meet your maker."
+msgstr "Du er udløbet og er gået hen for at møde din skaber."
 
-#: ../src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:122
+msgid "You're a stiff."
+msgstr "Du er en hård nød at knække, men desværre død."
 
-#: ../src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Vægt:"
+#: src/net/tmwa/playerhandler.cpp:123
+msgid "Bereft of life, you rest in peace."
+msgstr "Du siver langtsomt ud af din krop, du kan nu endelig slappe af."
 
-#: ../src/gui/itempopup.cpp:126
-#, fuzzy, c-format
-msgid "Weight: %s"
-msgstr "Vægt: "
+#: src/net/tmwa/playerhandler.cpp:124
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+"Hvis det ikke var fordi du var så animeret, kunne du sikker imponere Chuck "
+"Norris."
 
-#: ../src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "NÃ¥r ignorer:"
+#: src/net/tmwa/playerhandler.cpp:125
+msgid "Your metabolic processes are now history."
+msgstr "Din tid er ovre."
 
-#: ../src/gui/popupmenu.cpp:91
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "Hvisk"
+#: src/net/tmwa/playerhandler.cpp:126
+msgid "You're off the twig."
+msgstr "Drik noget syre."
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
+#: src/net/tmwa/playerhandler.cpp:127
+msgid "You've kicked the bucket."
+msgstr "Du har stillet træskoene."
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "Beskeden kunne ikke sendes. Modtageren er ikke logget på."
+#: src/net/tmwa/playerhandler.cpp:128
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr "Du har spist af dødens pølse for den sidste gang."
 
-#: ../src/gui/chat.cpp:452
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Hvisker til %s: %s"
+#: src/net/tmwa/playerhandler.cpp:130
+msgid "You are an ex-player."
+msgstr "Du er en forhenværende spiller."
 
-#: ../src/gui/socialwindow.cpp:158
-#, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:131
+msgid "You're pining for the fjords."
+msgstr "Du er tabt bag en vogn."
 
-#: ../src/gui/socialwindow.cpp:237
-#, c-format
-msgid "Who would you like to invite to party %s?"
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
+msgid "Message"
+msgstr "Besked"
+
+#: src/net/tmwa/playerhandler.cpp:247
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Viljestyrke:"
+#: src/net/tmwa/playerhandler.cpp:313
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Du samlede op "
 
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
+#: src/net/tmwa/playerhandler.cpp:348
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Forkert magic_token"
-
-#: ../src/net/tmwa/loginhandler.cpp:159
-#, fuzzy
-msgid "Wrong password."
-msgstr "Forkert brugernavn eller password"
+#: src/net/tmwa/playerhandler.cpp:488
+msgid "Equip arrows first."
+msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Forkert brugernavn eller password"
+#: src/net/tmwa/specialhandler.cpp:144
+msgid "Trade failed!"
+msgstr "Handel fejlede!"
 
-#: ../src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Forkert brugernavn, password eller email-adresse."
+#: src/net/tmwa/specialhandler.cpp:147
+msgid "Emote failed!"
+msgstr "Emote fejlede!"
 
-#: ../src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Ja"
+#: src/net/tmwa/specialhandler.cpp:150
+msgid "Sit failed!"
+msgstr "Sæt dig fejlede!"
 
-#: ../src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Du er død"
+#: src/net/tmwa/specialhandler.cpp:153
+msgid "Chat creating failed!"
+msgstr "Det lykkedes ikke at starte en chat."
 
-#: ../src/net/tmwa/playerhandler.cpp:139
-msgid "You are an ex-player."
-msgstr "Du er en forhenværende spiller."
+#: src/net/tmwa/specialhandler.cpp:156
+msgid "Could not join party!"
+msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: ../src/net/tmwa/playerhandler.cpp:257
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:159
+msgid "Cannot shout!"
+msgstr "Kan ikke råbe!"
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Du er død."
+#: src/net/tmwa/specialhandler.cpp:168
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Du er ikke nået til det rette Niveau endnu!"
 
-#: ../src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Du er ikke mere."
+#: src/net/tmwa/specialhandler.cpp:171
+msgid "Insufficient HP!"
+msgstr "Utilstrækkelig HP!"
 
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Du er ikke så levende som du engang har været."
+#: src/net/tmwa/specialhandler.cpp:174
+msgid "Insufficient SP!"
+msgstr "Utilstrækkelig SP!"
 
-#: ../src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:177
+msgid "You have no memos!"
+msgstr "Du har ingen memorandaer!"
 
-#: ../src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Det kan du ikke gøre lige nu!"
 
-#: ../src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:183
+msgid "Seems you need more money... ;-)"
+msgstr "Det ser ud til at du ikke har nok penge... :-)"
+
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan ikke bruge denne færdighed med dette slags våben!"
 
-#: ../src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "Du har ikke penge nok."
-
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
-#, fuzzy, c-format
-msgid "You get %s"
-msgstr "Du får %s."
+#: src/net/tmwa/specialhandler.cpp:189
+msgid "You need another red gem!"
+msgstr "Du har behov for en rød krystal mere"
 
-#: ../src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "Du giver:"
+#: src/net/tmwa/specialhandler.cpp:192
+msgid "You need another blue gem!"
+msgstr "Du har behov for en blå krystal mere"
 
-#: ../src/gui/socialwindow.cpp:592
-#, fuzzy, c-format
-msgid "You have been invited to join the %s party."
-msgstr "%s har inviteret med i %s's gruppe."
+#: src/net/tmwa/specialhandler.cpp:195
+msgid "You're carrying to much to do this!"
+msgstr "Du har for meget på dig, til at kunne gøre dette"
 
-#: ../src/gui/socialwindow.cpp:588
-#, fuzzy
-msgid "You have been invited you to join a party."
-msgstr "%s har inviteret med i sin gruppe"
+#: src/net/tmwa/specialhandler.cpp:198
+msgid "Huh? What's that?"
+msgstr "Hmm? Hvad er det?"
 
-#: ../src/net/tmwa/loginhandler.cpp:168
-#, fuzzy
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr "Du er blevet bandlyst permanent fra spillet. Kontakt en GM."
+#: src/net/tmwa/specialhandler.cpp:207
+msgid "Warp failed..."
+msgstr "Warp mislykkede..."
 
-#: ../src/net/tmwa/loginhandler.cpp:172
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
-msgstr ""
-"Du er blevet bandlyst fra spillet indtil %s. Kontakt venligst en GM i "
-"forummet."
+#: src/net/tmwa/specialhandler.cpp:210
+msgid "Could not steal anything..."
+msgstr "Kunne ikke stjæle noget som helst..."
 
-#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Du er holdt op med at være til."
+#: src/net/tmwa/specialhandler.cpp:213
+msgid "Poison had no effect..."
+msgstr "Giften havde ingen effekt..."
 
-#: ../src/net/tmwa/partyhandler.cpp:241
-msgid "You have left the party."
-msgstr "Du har foradt gruppen."
+#: src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Du kan ikke handle. Handle partneren er for langt væk."
 
-#: ../src/net/tmwa/specialhandler.cpp:180
-msgid "You have no memos!"
-msgstr "Du har ingen memorandaer!"
+#: src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Du kan ikke handle. Karakteren findes ikke."
 
-#: ../src/net/tmwa/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Du er ikke nået til det rette Niveau endnu!"
+#: src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Handlen blev annulleret af en ukendt grund."
 
-#: ../src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Byttehandel: %s og dig."
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Byttehandel med %s blev afbrudt."
 
-#: ../src/net/tmwa/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "Du har behov for en blå krystal mere"
+#: src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr "En besked om at afbryde byttehandlen blev ikke opfattet."
 
-#: ../src/net/tmwa/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "Du har behov for en rød krystal mere"
+#: src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Fejlede i at tilføje genstand. Handels partneren bære på for meget."
 
-#: ../src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
+#: src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
+"Fejlede i at tilføje genstand. Handels partneren har ikke flere frie pladser."
 
-#: ../src/localplayer.cpp:1276
-#, fuzzy, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Du samlede %s [@@%d|%s@@] op."
-msgstr[1] "Du samlede %s [@@%d|%s@@] op."
-
-#: ../src/net/tmwa/playerhandler.cpp:344
-#, fuzzy, c-format
-msgid "You picked up %s."
-msgstr "Du samlede op "
+#: src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Fejlede i at tilføje genstand af en ukendt grund."
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny."
+#: src/playerrelations.cpp:310
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore||Ignorer %s fuldstændigt@@"
 
-#: ../src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "Du er en hård nød at knække, men desværre død."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "Du har for meget på dig, til at kunne gøre dette"
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "Angreb %+d"
 
-#: ../src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "Du er ikke død endnu. Du hviler dig bare."
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "Forsvar %+d"
 
-#: ../src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
-msgstr "Drik noget syre."
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: ../src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr "Du er tabt bag en vogn."
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: ../src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "Du er udløbet og er gået hen for at møde din skaber."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Ukendt genstand"
 
-#: ../src/net/tmwa/playerhandler.cpp:136
-msgid "You've kicked the bucket."
-msgstr "Du har stillet træskoene."
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "unavngivet"
 
-#: ../src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr "Du har spist af dødens pølse for den sidste gang."
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: ../src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
-msgstr ""
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: ../src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "Din tid er ovre."
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: ../src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Dit navn skal være mindst 4 bogstaver langt."
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Penge: %d"
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr "Din plan om at smadre fjendens våben, ved at benytte din hals fejlede."
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Job:"
 
-#: ../src/gui/setup_video.cpp:233
-msgid "as particle"
-msgstr "som partikeleffekt"
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Niveau: %d"
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "høj"
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "Adgang nægtet"
 
-#: ../src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "i chat"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Der opstod en ukendt fejl da du valgte karakter"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "lav"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Serveren understøtter ikke denne type invitationer endnu."
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr ""
+#~ msgid "Willpower:"
+#~ msgstr "Viljestyrke:"
 
-#: ../src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "maks"
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Viljestyrke:"
 
-#: ../src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "mellem"
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "Serveren er fuld"
 
-#: ../src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "deaktiveret"
+#~ msgid "Text Shadow"
+#~ msgstr "Skygger"
 
-#: ../src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr ""
+#~ msgid "Text Outline"
+#~ msgstr "Kontur"
 
-#: ../src/gui/serverdialog.cpp:558
-#, c-format
-msgid "requires v%s"
-msgstr ""
+#~ msgid "Background"
+#~ msgstr "Baggrund"
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
-msgid "unnamed"
-msgstr "unavngivet"
+#~ msgid "Highlight"
+#~ msgstr "Fremhæv"
 
-#~ msgid "  -D --default    : Bypass the login process with default settings"
-#~ msgstr ""
-#~ "  -D --default    : Overskriv login processen med normale indstillinger"
+#~ msgid "Tab Highlight"
+#~ msgstr "Fremhæv tab"
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " kan ikke laves, men det findes ikke! Lukker."
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Du har ikke penge nok"
 
-#~ msgid " host: "
-#~ msgstr " host: "
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Du har udrustet dig"
 
-#~ msgid " video mode: "
-#~ msgstr " skærm opsætning: "
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Refleks:"
+#~ msgid "Player"
+#~ msgstr "Bruger"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Samme som /create"
+#~ msgid "Whisper"
+#~ msgstr "Hvisk"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "HP tabel 1/2 fuld"
+#~ msgid "Is"
+#~ msgstr "Er"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "HP tabel 1/4 fuld"
+#~ msgid "Server"
+#~ msgstr "Server"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Tohåndsvåben"
+#~ msgid "Logger"
+#~ msgstr "Logger"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "HP tabel 3/4 fuld"
+#~ msgid "Hyperlink"
+#~ msgstr "Hyperlink"
 
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Spark spiller ud@@"
+#~ msgid "Being"
+#~ msgstr "Skabning"
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Angrib %s@@"
+#~ msgid "Other Players' Names"
+#~ msgstr "Andre spilleres navne"
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Annuller@@"
+#~ msgid "Own Name"
+#~ msgstr "Eget navn"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Smid@@"
+#~ msgid "GM Names"
+#~ msgstr "GM-navne"
 
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|Ignorer %s@@"
+#~ msgid "NPCs"
+#~ msgstr "NPC'er"
 
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|Saml %s op@@"
+#~ msgid "Monsters"
+#~ msgstr "Monstre"
 
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|Hent fra lager@@"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Ukendt genstand"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Opdel@@"
+#~ msgid "Generics"
+#~ msgstr "Alment formål"
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Gem på lager@@"
+#~ msgid "Hats"
+#~ msgstr "Hatte"
 
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Handl med %s@@"
+#~ msgid "Usables"
+#~ msgstr "Forbrugsvarer"
 
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Hold op med at ignorere %s@@"
+#~ msgid "Shirts"
+#~ msgstr "Trøjer"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Tag på@@"
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Ethåndsvåben"
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Hold op med at bruge@@"
+#~ msgid "Pants"
+#~ msgstr "Bukser"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Brug@@"
+#~ msgid "Shoes"
+#~ msgstr "Sko"
 
 #, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Adgang nægtet"
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Ethåndsvåben"
 
-#~ msgid "Ammo"
-#~ msgstr "Ammunition"
+#~ msgid "Shields"
+#~ msgstr "Skjolde"
+
+#~ msgid "Rings"
+#~ msgstr "Ringe"
+
+#~ msgid "Necklaces"
+#~ msgstr "Halskæder"
 
 #~ msgid "Arms"
 #~ msgstr "VÃ¥ben"
 
-#~ msgid "Attack:"
-#~ msgstr "Angreb:"
+#~ msgid "Ammo"
+#~ msgstr "Ammunition"
 
-#~ msgid "Axe"
-#~ msgstr "Økse"
+#~ msgid "Particle Effects"
+#~ msgstr "Partikeleffekter"
 
-#~ msgid "Background"
-#~ msgstr "Baggrund"
+#~ msgid "Pickup Notification"
+#~ msgstr "Opsamlingsnotits"
 
-#~ msgid "Bow"
-#~ msgstr "Bue"
+#~ msgid "Exp Notification"
+#~ msgstr "XP-notits"
 
-#~ msgid "Buddy"
-#~ msgstr "Ven"
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Spiller rammer monster"
 
-#~ msgid "Buddy List"
-#~ msgstr "Venner"
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monster rammer spiller"
 
-#~ msgid "Buddys"
-#~ msgstr "Venner"
+#~ msgid "Critical Hit"
+#~ msgstr "Kritisk sår"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Kast test-formular 1"
-
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Kast test-formular 2"
+#~ msgid "Misses"
+#~ msgstr "Rammer forbi"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Kast test-formular 3"
+#~ msgid "HP Bar"
+#~ msgstr "HP tabel"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Kommando: /new <gruppe>"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "HP tabel 3/4 fuld"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Opretter forbindelse til bruger-serveren..."
+#~ msgid "1/2 HP Bar"
+#~ msgstr "HP tabel 1/2 fuld"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Opretter forbindelse til karakter-serveren..."
+#~ msgid "1/4 HP Bar"
+#~ msgstr "HP tabel 1/4 fuld"
 
-#~ msgid "Cost"
-#~ msgstr "Pris"
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Handl med %s@@"
 
-#~ msgid "Couldn't set "
-#~ msgstr "Kunne ikke definere "
+#~ msgid "no"
+#~ msgstr "nej"
 
-#~ msgid "Craft"
-#~ msgstr "Håndværk"
+#~ msgid "Buddy"
+#~ msgstr "Ven"
 
-#~ msgid "Crafts"
-#~ msgstr "Håndværk"
+#~ msgid "Buddy List"
+#~ msgstr "Venner"
 
 #~ msgid "Description: %s"
 #~ msgstr "Beskrivelse: %s"
@@ -3944,211 +3821,225 @@ msgstr "unavngivet"
 #~ msgid "Effect: %s"
 #~ msgstr "Effekt: %s"
 
-#~ msgid "Emote"
-#~ msgstr "Emote"
+#~ msgid "Previous"
+#~ msgstr "Forrige"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Fejlede i at skifte til "
+#~ msgid "New"
+#~ msgstr "Opret"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#~ msgid "Job Level: %d"
+#~ msgstr "Jobniveau: %d"
 
-#~ msgid "Generics"
-#~ msgstr "Alment formål"
+#~ msgid "Present: "
+#~ msgstr "Til stede: "
 
-#~ msgid "Guilds"
-#~ msgstr "Guilds"
+#~ msgid "Quit Guild"
+#~ msgstr "Forlad guild"
 
-#~ msgid "HP Bar"
-#~ msgstr "HP tabel"
+#~ msgid "Ok"
+#~ msgstr "O.K."
 
-#~ msgid "Hats"
-#~ msgstr "Hatte"
+#~ msgid "Recent:"
+#~ msgstr "Seneste:"
 
-#~ msgid "Highlight"
-#~ msgstr "Fremhæv"
+#~ msgid "Magic"
+#~ msgstr "Magi"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Hyperlink"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Kast test-formular 1"
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Serveren understøtter ikke denne type invitationer endnu."
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Kast test-formular 2"
 
-#~ msgid "Is"
-#~ msgstr "Er"
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Kast test-formular 3"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Du har udrustet dig"
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Tohåndsvåben"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Du har ikke penge nok"
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Angrib %s@@"
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Jobniveau: %d"
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignorer %s@@"
 
-#~ msgid "Knife"
-#~ msgstr "Kniv"
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Hold op med at ignorere %s@@"
 
-#~ msgid "Logger"
-#~ msgstr "Logger"
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Spark spiller ud@@"
 
-#~ msgid "Mace"
-#~ msgstr "Kølle"
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Annuller@@"
 
-#~ msgid "Magic"
-#~ msgstr "Magi"
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Saml %s op@@"
 
-#~ msgid "Max level"
-#~ msgstr "Maks. level"
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Hold op med at bruge@@"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Mystisk færdighed."
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Tag på@@"
 
-#~ msgid "Necklaces"
-#~ msgstr "Halskæder"
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Brug@@"
 
-#~ msgid "New"
-#~ msgstr "Opret"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Smid@@"
 
-#~ msgid "Ok"
-#~ msgstr "O.K."
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Opdel@@"
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Ethåndsvåben"
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Gem på lager@@"
 
-#~ msgid "Pants"
-#~ msgstr "Bukser"
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Hent fra lager@@"
 
-#~ msgid "Party Window"
-#~ msgstr "Party-vindue"
+#~ msgid "Select Server"
+#~ msgstr "Vælg server"
 
-#~ msgid "Player"
-#~ msgstr "Bruger"
+#~ msgid "Failed to switch to "
+#~ msgstr "Fejlede i at skifte til "
 
-#~ msgid "Polearm"
-#~ msgstr "Hellebard"
+#~ msgid "windowed"
+#~ msgstr "som vindue"
 
-#~ msgid "Present: "
-#~ msgstr "Til stede: "
+#~ msgid "fullscreen"
+#~ msgstr "fuld skærm"
 
-#~ msgid "Previous"
-#~ msgstr "Forrige"
+#~ msgid "Mystery Skill"
+#~ msgstr "Mystisk færdighed."
 
-#~ msgid "Quit Guild"
-#~ msgstr "Forlad guild"
+#~ msgid "Weapons"
+#~ msgstr "VÃ¥ben"
 
-#~ msgid "Recent:"
-#~ msgstr "Seneste:"
+#~ msgid "Crafts"
+#~ msgstr "Håndværk"
+
+#~ msgid "Stats"
+#~ msgstr "Egenskaber"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Cost"
+#~ msgstr "Pris"
+
+#~ msgid "Attack:"
+#~ msgstr "Angreb:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% Refleks:"
 
 #~ msgid "Remaining Status Points: %d"
 #~ msgstr "Tilgode Status Points: %d"
 
-#~ msgid "Rings"
-#~ msgstr "Ringe"
+#~ msgid "Max level"
+#~ msgstr "Maks. level"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Acceleration på mus"
+#~ msgid "curl error "
+#~ msgstr "curl fejl "
 
-#~ msgid "Scroll radius"
-#~ msgstr "Følsomhed på mus"
+#~ msgid " host: "
+#~ msgstr " host: "
 
-#~ msgid "Select Server"
-#~ msgstr "Vælg server"
+#~ msgid "Guilds"
+#~ msgstr "Guilds"
 
-#~ msgid "Server"
-#~ msgstr "Server"
+#~ msgid "Buddys"
+#~ msgstr "Venner"
 
-#~ msgid "Shields"
-#~ msgstr "Skjolde"
+#~ msgid "Party Window"
+#~ msgstr "Party-vindue"
 
-#~ msgid "Shirts"
-#~ msgstr "Trøjer"
+#~ msgid "Unarmed"
+#~ msgstr "Ubevæbnet"
 
-#~ msgid "Shoes"
-#~ msgstr "Sko"
+#~ msgid "Knife"
+#~ msgstr "Kniv"
 
-#~ msgid "Shooting"
-#~ msgstr "Missil-våben"
+#~ msgid "Sword"
+#~ msgstr "Sværd"
+
+#~ msgid "Polearm"
+#~ msgstr "Hellebard"
 
 #~ msgid "Staff"
 #~ msgstr "Stav"
 
-#~ msgid "Stats"
-#~ msgstr "Egenskaber"
+#~ msgid "Whip"
+#~ msgstr "Pisk"
 
-#~ msgid "Sword"
-#~ msgstr "Sværd"
+#~ msgid "Bow"
+#~ msgstr "Bue"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Fremhæv tab"
+#~ msgid "Shooting"
+#~ msgstr "Missil-våben"
 
-#~ msgid "Text Outline"
-#~ msgstr "Kontur"
+#~ msgid "Mace"
+#~ msgstr "Kølle"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Skygger"
+#~ msgid "Axe"
+#~ msgstr "Økse"
 
 #~ msgid "Thrown"
 #~ msgstr "Kastevåben"
 
-#~ msgid "Total"
-#~ msgstr "Total"
-
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Ethåndsvåben"
-
-#~ msgid "Unable to load selection.png"
-#~ msgstr "Kan ikke loade valgte-billede.png"
-
-#~ msgid "Unarmed"
-#~ msgstr "Ubevæbnet"
+#~ msgid "Craft"
+#~ msgstr "Håndværk"
 
 #~ msgid "Unknown Skill"
 #~ msgstr "Ukendt evne"
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Der opstod en ukendt fejl da du valgte karakter"
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " kan ikke laves, men det findes ikke! Lukker."
 
-#~ msgid "Unnamed"
-#~ msgstr "Unavngivet"
+#~ msgid "Couldn't set "
+#~ msgstr "Kunne ikke definere "
 
-#~ msgid "Usables"
-#~ msgstr "Forbrugsvarer"
+#~ msgid " video mode: "
+#~ msgstr " skærm opsætning: "
 
-#~ msgid "Weapons"
-#~ msgstr "VÃ¥ben"
+#~ msgid "mana"
+#~ msgstr "mana"
 
-#~ msgid "Whip"
-#~ msgstr "Pisk"
+#~ msgid "Connecting to character server..."
+#~ msgstr "Opretter forbindelse til karakter-serveren..."
 
-#~ msgid "Whisper"
-#~ msgstr "Hvisk"
+#~ msgid "Connecting to account server..."
+#~ msgstr "Opretter forbindelse til bruger-serveren..."
 
-#~ msgid "Willpower:"
-#~ msgstr "Viljestyrke:"
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Samme som /create"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Kommando: /new <gruppe>"
 
 #~ msgid "a"
 #~ msgstr "en/et"
 
-#~ msgid "curl error "
-#~ msgstr "curl fejl "
+#~ msgid "Unnamed"
+#~ msgstr "Unavngivet"
 
-#~ msgid "fullscreen"
-#~ msgstr "fuld skærm"
+#~ msgid "Scroll radius"
+#~ msgstr "Følsomhed på mus"
 
-#~ msgid "inc"
-#~ msgstr "inc"
+#~ msgid "Scroll laziness"
+#~ msgstr "Acceleration på mus"
 
-#~ msgid "mana"
-#~ msgstr "mana"
+#~ msgid "Save player list"
+#~ msgstr "Gem bruger liste"
 
-#~ msgid "no"
-#~ msgstr "nej"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "Kan ikke loade valgte-billede.png"
 
-#~ msgid "windowed"
-#~ msgstr "som vindue"
+#~ msgid "Emote"
+#~ msgstr "Emote"
+
+#~ msgid "inc"
+#~ msgstr "inc"
+
+#~ msgid "  -D --default    : Bypass the login process with default settings"
+#~ msgstr ""
+#~ "  -D --default    : Overskriv login processen med normale indstillinger"
diff --git a/po/de.po b/po/de.po
index be38a183..c813a471 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,446 +8,430 @@
 # seeseekey <seeseekey@googlemail.com>, 2009.
 # #-#-#-#-#  de.po (The Mana World 0.1.0)  #-#-#-#-#
 # German translation of The Mana World.
-# Copyright (C) 2007 The Mana World Development Team
+# Copyright (C) 2007-2009 The Mana World Development Team
+# Copyright (C) 2010 The Mana Development Team
 # This file is distributed under the same license as the The Mana World package.
 #
 # Matthias Hartmann <hartmann.matthias@gmail.com>, 2007.
 # Jonathan Raphael Joachim Kolberg, 2009, 2010.
 # seeseekey <seeseekey@googlemail.com>, 2009.
-#, fuzzy
+# Andrej, 2009.
 msgid ""
 msgstr ""
+"#-#-#-#-#  po_de.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
-"PO-Revision-Date: 2010-01-02 15:26+0000\n"
-"Last-Translator: Jonathan Raphael Joachim Kolberg\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"PO-Revision-Date: 2011-01-03 22:40+0100\n"
+"Last-Translator: Matthias Hartmann <hartmann.matthias@gmail.com>\n"
 "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  po_de.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Launchpad-Export-Date: 2009-06-02 17:48+0000\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "#-#-#-#-#  de.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Project-Id-Version: The Mana World 0.1.0\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
+"PO-Revision-Date: 2010-01-02 15:26+0000\n"
+"Last-Translator: Jonathan Raphael Joachim Kolberg\n"
+"Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Launchpad-Export-Date: 2009-06-02 17:48+0000\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../src/gui/npcdialog.cpp:183
-msgid ""
-"\n"
-"> Next\n"
-msgstr ""
-"\n"
-"Weiter\n"
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Einstellungen"
 
-#: ../src/main.cpp:60
+#: src/client.cpp:679
 #, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : OpenGL-Erweiterungen deaktivieren"
+msgid "Connecting to server"
+msgstr "Verbinde mit [Benutzerdatenserver]..."
 
-#: ../src/main.cpp:58
+#: src/client.cpp:706
 #, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
+msgid "Logging in"
+msgstr "Anmelden"
 
-#: ../src/main.cpp:52
-#, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Benutze angegebenen Updateserver"
+#: src/client.cpp:739
+msgid "Entering game world"
+msgstr "Betrete die Spielwelt"
 
-#: ../src/main.cpp:46
+#: src/client.cpp:804
 #, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : zu benutzende Konfigurationsdatei"
-
-#: ../src/main.cpp:53
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default : Wähle zuletzt benutzten Server und Spieler aus"
+msgid "Requesting characters"
+msgstr "Spielfigur auswählen"
 
-#: ../src/main.cpp:57
+#: src/client.cpp:833
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
-
-#: ../src/main.cpp:48
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Angegebenes Passwort benutzen"
-
-#: ../src/main.cpp:47
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Mit angegebenem Benutzernamen anmelden"
-
-#: ../src/main.cpp:49
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --charakter : Mit angegebenem Spieler anmelden"
-
-#: ../src/main.cpp:56
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
-
-#: ../src/main.cpp:45
-msgid "  -h --help           : Display this help"
-msgstr "  - --help : Zeigt diesen Hilfstext an"
+msgid "Connecting to the game server"
+msgstr "Verbinde mit [Charakterserver]..."
 
-#: ../src/main.cpp:51
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Port des Loginservers"
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Wechsle den Server"
 
-#: ../src/main.cpp:50
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Name oder IP-Adresse des Loginservers"
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Fehler"
 
-#: ../src/main.cpp:55
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Ãœberspringe das Herunterladen von Updates"
+#: src/client.cpp:888
+msgid "Requesting registration details"
+msgstr "Fordere Registrierungsdetails an"
 
-#: ../src/main.cpp:44
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Die Version des Spieles anzeigen"
+#: src/client.cpp:915
+msgid "Password Change"
+msgstr "Passwort ändern:"
 
-#: ../src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1 Es wird dringend empfohlen,"
+#: src/client.cpp:916
+msgid "Password changed successfully!"
+msgstr "Passwort erfolgreich geändert!"
 
-#: ../src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
+#: src/client.cpp:935
+msgid "Email Change"
+msgstr "E-Mail ändern"
 
-#: ../src/gui/updatewindow.cpp:421
+#: src/client.cpp:936
 #, fuzzy
-msgid "##1  you try again later."
-msgstr "##1 es später erneut zu versuchen."
-
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, c-format
-msgid "% Accuracy"
-msgstr "% Accuracy"
-
-#: ../src/net/tmwa/generalhandler.cpp:230
-#, c-format
-msgid "% Critical"
-msgstr "% Critical"
-
-#: ../src/net/tmwa/generalhandler.cpp:229
-#, c-format
-msgid "% Evade"
-msgstr "% Evade"
+msgid "Email changed successfully!"
+msgstr "Mitglied wurde erfolgreich Befördert."
 
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr "%d FPS"
+#: src/client.cpp:956
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Abmelden"
 
-#: ../src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
-msgstr "%d FPS (OpenGL)"
+#: src/client.cpp:957
+msgid "Farewell, come back any time..."
+msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: ../src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s ist dem Kanal beigetreten."
-
-#: ../src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
-
-#: ../src/gui/socialwindow.cpp:561
-#, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
-
-#: ../src/gui/socialwindow.cpp:600
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s hat dich in seine Party eingeladen."
-
-#: ../src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s hat %s gekickt."
-
-#: ../src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s hat Deine Party verlassen."
-
-#: ../src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s hat den Modus %s auf den Spieler %s gesetzt."
-
-#: ../src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s ist bereits Mitglied einer Party."
-
-#: ../src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s ist nicht in Deiner Party!"
+#: src/client.cpp:1281
+#, fuzzy, c-format
+msgid "Invalid update host: %s"
+msgstr "Ungültiger Updateserver: "
 
-#: ../src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s ist nun Mitglied Deiner Party."
+#: src/client.cpp:1315 src/client.cpp:1321
+msgid "Error creating updates directory!"
+msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: ../src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s ist der Party beigetreten."
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
+msgid "Unknown command."
+msgstr "Unbekannter Befehl."
 
-#: ../src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr "%s hat den Channel verlassen."
+#: src/commandhandler.cpp:160
+msgid "-- Help --"
+msgstr "-- Hilfe --"
 
-#: ../src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s hat Deine Einladung zurückgewiesen."
+#: src/commandhandler.cpp:161
+msgid "/help > Display this help"
+msgstr "/help > diese Hilfe anzeigen"
 
-#: ../src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s hat Deine Einladung zurückgewiesen."
+#: src/commandhandler.cpp:163
+msgid "/where > Display map name"
+msgstr "/where > Zeige den Namen der aktuellen Karte"
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s möchte mit dir handeln, stimmst du zu?"
+#: src/commandhandler.cpp:164
+msgid "/who > Display number of online users"
+msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
 
-#: ../src/gui/widgets/chattab.cpp:152
-#, fuzzy, c-format
-msgid "%s whispers: %s"
-msgstr "%s flüstert: "
+#: src/commandhandler.cpp:165
+msgid "/me > Tell something about yourself"
+msgstr "/me > Erzähle etwas über Dich"
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
-msgid "(empty)"
-msgstr "(leer)"
+#: src/commandhandler.cpp:167
+msgid "/clear > Clears this window"
+msgstr "/clear > Löscht den Inhalt dieses Fensters"
 
-#: ../src/commandhandler.cpp:222
-msgid "*** only available to a GM ***"
-msgstr "*** Nur für GMs verfügbar ***"
+#: src/commandhandler.cpp:169
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Sende eine private Nachricht an einen Benutzer"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
-msgid "+"
-msgstr "+"
+#: src/commandhandler.cpp:170
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Ersatz für msg"
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
-msgid "-"
-msgstr "-"
+#: src/commandhandler.cpp:171
+msgid "/w > Alias of msg"
+msgstr "/w > Ersatz für msg"
 
-#: ../src/commandhandler.cpp:166
-msgid "-- Help --"
-msgstr "-- Hilfe --"
+#: src/commandhandler.cpp:172
+msgid "/query > Makes a tab for private messages with another user"
+msgstr ""
+"/query > Öffnet einen Tab für private Nachrichten mit einem anderen Benutzer"
 
-#: ../src/commandhandler.cpp:201
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Globale Ansage (Nur von GM's nutzbar)"
+#: src/commandhandler.cpp:174
+msgid "/q > Alias of query"
+msgstr "/q > Ersatz für query"
 
-#: ../src/commandhandler.cpp:182
+#: src/commandhandler.cpp:181
 msgid "/away > Tell the other whispering players you're away from keyboard."
 msgstr ""
 "/away > Teilt den anderen flüsternden Spielern deine Abwesenheit von der "
 "Tastatur mit."
 
-#: ../src/commandhandler.cpp:173
-msgid "/clear > Clears this window"
-msgstr "/clear > Löscht den Inhalt dieses Fensters"
+#: src/commandhandler.cpp:184
+msgid "/ignore > ignore a player"
+msgstr "/ignore > Ignoriere einen Spieler"
 
-#: ../src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Schließe einen privaten Tab"
+#: src/commandhandler.cpp:177
+msgid "/unignore > stop ignoring a player"
+msgstr "/unignore > Ignorierung eines Spielers aufheben"
+
+#: src/commandhandler.cpp:179
+msgid "/list > Display all public channels"
+msgstr "/list > Zeige alle öffentlichen Kanäle"
+
+#: src/commandhandler.cpp:180
+msgid "/join > Join or create a channel"
+msgstr "/join > Trete einem Kanal bei oder erstelle einen neuen Kanal"
 
-#: ../src/commandhandler.cpp:191
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Erstelle eine neue Party"
 
-#: ../src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
+#: src/commandhandler.cpp:183
+msgid "/party > Invite a user to party"
+msgstr "/party > Lade einen Benutzer zu deiner Party ein"
+
+#: src/commandhandler.cpp:185
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Starte die Aufzeichnung des Chats in eine Datei"
+
+#: src/commandhandler.cpp:187
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr "/toggle > Entscheide, ob <return> den Chat-Dialog schließt"
+
+#: src/commandhandler.cpp:189
+msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
-"/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in der "
-"Party"
+"/present > Liste anwesender Spieler (wird im Chat-log aufgezeichnet, falls "
+"das Log aktiviert ist)"
 
-#: ../src/commandhandler.cpp:167
-msgid "/help > Display this help"
-msgstr "/help > diese Hilfe anzeigen"
+#: src/commandhandler.cpp:192
+msgid "/announce > Global announcement (GM only)"
+msgstr "/announce > Globale Ansage (Nur von GMs nutzbar)"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Diese Hilfe anzeigen"
+#: src/commandhandler.cpp:196
+msgid "For more information, type /help <command>."
+msgstr "Für mehr Informationen, gib /help <Befehl> ein."
 
-#: ../src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
-msgstr "/ignore > Anderen Spieler ignorieren"
+#: src/commandhandler.cpp:200
+msgid "Command: /help"
+msgstr "Befehl: /help"
 
-#: ../src/commandhandler.cpp:185
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Ignoriere einen Spieler"
+#: src/commandhandler.cpp:201
+msgid "This command displays a list of all commands available."
+msgstr "Dieser Befehl zeigt alle möglichen Befehle an"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
+#: src/commandhandler.cpp:203
+msgid "Command: /help <command>"
+msgstr "Befehl: /help <Befehl>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
+#: src/commandhandler.cpp:204
+msgid "This command displays help on <command>."
+msgstr "Dieser Befehl zeigt die Hilfe für <Befehl>."
 
-#: ../src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
+#: src/commandhandler.cpp:212
+msgid "Command: /announce <msg>"
+msgstr "Befehl: /announce <Nachricht>"
+
+#: src/commandhandler.cpp:213
+msgid "*** only available to a GM ***"
+msgstr "*** Nur für GMs verfügbar ***"
+
+#: src/commandhandler.cpp:214
+msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
-"/item > Zeige oder ändere die Optionen zum Teilen der Gegenstände in der "
-"Party"
+"Dieser Befehl versendet die Nachricht <Nachricht> an alle Spieler die gerade "
+"online sind."
 
-#: ../src/commandhandler.cpp:189
-msgid "/join > Join or create a channel"
-msgstr "/join > Trete einem Kanal bei oder erstelle einen neuen Kanal"
+#: src/commandhandler.cpp:219
+msgid "Command: /clear"
+msgstr "Befehl: /clear"
 
-#: ../src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Werfe einen Spieler aus dem Kanal"
+#: src/commandhandler.cpp:220
+msgid "This command clears the chat log of previous chat."
+msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
-#, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Werfe jemanden aus Deiner Party"
+#: src/commandhandler.cpp:224
+msgid "Command: /ignore <player>"
+msgstr "Befehl: /item <Wert>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Werfe jemanden aus Deiner Party"
+#: src/commandhandler.cpp:225
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
-#, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
+#: src/commandhandler.cpp:230
+msgid "Command: /join <channel>"
+msgstr "Befehl: /join <Kanal>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
+#: src/commandhandler.cpp:231
+msgid "This command makes you enter <channel>."
+msgstr "Dieser Befehl lässt dich dem Kanal <Kanal> beitreten."
 
-#: ../src/commandhandler.cpp:188
-msgid "/list > Display all public channels"
-msgstr "/list > Zeige alle öffentlichen Kanäle"
+#: src/commandhandler.cpp:232
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Falls Kanal <Kanal> nicht existiert, wird er erstellt."
 
-#: ../src/commandhandler.cpp:171
-msgid "/me > Tell something about yourself"
-msgstr "/me > Erzähle etwas über Dich"
+#: src/commandhandler.cpp:236
+msgid "Command: /list"
+msgstr "Befehl: /list"
 
-#: ../src/commandhandler.cpp:175
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Sende eine private Nachricht an einen Benutzer"
+#: src/commandhandler.cpp:237
+msgid "This command shows a list of all channels."
+msgstr "Dieser Befehl zeigt eine liste aller Kanäle an."
 
-#: ../src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Ernenne einen Spieler zum Kanalwärter"
+#: src/commandhandler.cpp:241
+msgid "Command: /me <message>"
+msgstr "Befehl: /me <Nachricht>"
 
-#: ../src/commandhandler.cpp:192
-msgid "/party > Invite a user to party"
-msgstr "/party > Lade einen Benutzer zu deiner Party ein"
+#: src/commandhandler.cpp:242
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Dieser Befehl zeigt eine Aktion <Nachricht> an."
 
-#: ../src/commandhandler.cpp:198
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Liste anwesender Spieler (wird im Chat-log aufgezeichnet, falls "
-"das Log aktiviert ist)"
+#: src/commandhandler.cpp:246
+msgid "Command: /msg <nick> <message>"
+msgstr "Befehl: /msg <Name> <Nachricht>"
 
-#: ../src/commandhandler.cpp:180
-msgid "/q > Alias of query"
-msgstr "/q > Ersatz für query"
+#: src/commandhandler.cpp:247
+msgid "Command: /whisper <nick> <message>"
+msgstr "Befehl: /whisper <Name> <Nachricht>"
 
-#: ../src/commandhandler.cpp:178
-msgid "/query > Makes a tab for private messages with another user"
+#: src/commandhandler.cpp:248
+msgid "Command: /w <nick> <message>"
+msgstr "Befehl: /w <Name> <Nachricht>"
+
+#: src/commandhandler.cpp:249
+msgid "This command sends the text <message> to <nick>."
+msgstr "Dieser Befehl sendet den Text <Nachricht> an den Spieler <Name>."
+
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
-"/query > Öffnet einen Tab für private Nachrichten mit einem anderen Benutzer"
+"Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
+"(\")."
 
-#: ../src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Verlasse einen Kanal"
+#: src/commandhandler.cpp:255
+msgid "Command: /query <nick>"
+msgstr "Befehl: /query <Name>"
 
-#: ../src/commandhandler.cpp:194
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Starte die Aufzeichnung des Chats in eine Datei"
+#: src/commandhandler.cpp:256
+msgid "Command: /q <nick>"
+msgstr "Befehl: /q <Name>"
 
-#: ../src/commandhandler.cpp:196
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Entscheide, ob <return> den Chat-Dialog schließt"
+#: src/commandhandler.cpp:257
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+msgstr ""
+"Dieser Befehl erstellt einen neuen Tab für private Nachrichten zwischen Dir "
+"und Spieler <Name>."
 
-#: ../src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Setze das Thema des aktuellen Kanals"
+#: src/commandhandler.cpp:270
+#, fuzzy
+msgid "Command: /away <afk reason>"
+msgstr "Befehl: /w <Name> <Nachricht>"
 
-#: ../src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
-msgstr "/unignore > Anderen Spieler nicht mehr ignorieren"
+#: src/commandhandler.cpp:271
+msgid "This command tells you're away from keyboard with the given reason."
+msgstr "Dieser Befehl teilt deine Abwesenheit und deren angegebenen Grund mit."
 
-#: ../src/commandhandler.cpp:186
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Ignorierung eines Spielers aufheben"
+#: src/commandhandler.cpp:273
+#, fuzzy
+msgid "Command: /away"
+msgstr "Befehl: /who"
 
-#: ../src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Zeigt eine Liste der Spiele im aktuellen Kanal"
+#: src/commandhandler.cpp:274
+#, fuzzy
+msgid "This command clears the away status and message."
+msgstr "Dieser Befehl setzt das Theme auf <Thema>."
 
-#: ../src/commandhandler.cpp:177
-msgid "/w > Alias of msg"
-msgstr "/w > Ersatz für msg"
+#: src/commandhandler.cpp:278
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Befehl: /create <Party-Name>"
 
-#: ../src/commandhandler.cpp:169
-msgid "/where > Display map name"
-msgstr "/where > Zeige den Namen der aktuellen Karte"
+#: src/commandhandler.cpp:263
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
 
-#: ../src/commandhandler.cpp:176
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Ersatz für msg"
+#: src/commandhandler.cpp:267
+msgid "Command: /party <nick>"
+msgstr "Befehl: /party <Name>"
 
-#: ../src/commandhandler.cpp:170
-msgid "/who > Display number of online users"
-msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr "<"
+#: src/commandhandler.cpp:274
+msgid "Command: /present"
+msgstr "Befehl: /present"
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
+#: src/commandhandler.cpp:275
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
 msgstr ""
-"Gültige Werte für <Wert> sind: \"1\",\"yes\",\"true\" um das Teilen zu "
-"erlauben, \"0\",\"no\",\"false\" verbieten es."
+"Dieser Befehl erstellt eine Liste mit allen Spielern in Hörreichweite und "
+"sendet sie entweder an das Chatlog, falls aktiviert, oder zeigt sie im "
+"Chatfenster an."
+
+#: src/commandhandler.cpp:281
+msgid "Command: /record <filename>"
+msgstr "Befehl: /record <Dateiname>"
+
+#: src/commandhandler.cpp:282
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+"Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
+"<Dateiname>."
+
+#: src/commandhandler.cpp:284
+msgid "Command: /record"
+msgstr "Befehl: /record"
+
+#: src/commandhandler.cpp:285
+msgid "This command finishes a recording session."
+msgstr "Dieser Befehl beendet den Mitschnitt des Chats."
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/commandhandler.cpp:289
+msgid "Command: /toggle <state>"
+msgstr "Befehl: /toggle <Status>"
+
+#: src/commandhandler.cpp:290
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
-"<Wert> darf enthalten: \"1\",\"yes\" oder \"true\" um das Teilen von "
-"Gegenständen zu erlauben, \"0\",\"no\" oder \"false\" um es zu verbieten."
+"Mit diesem Befehl kannst Du entscheiden, ob die Chatzeile schließt, sobald "
+"eine Nachricht gesendet wurde, oder erst nachdem die Enter-Taste erneut "
+"gedrückt wurde."
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -455,4099 +439,4050 @@ msgstr ""
 "<Status> \"1\",\"yes\",\"true\" aktiviert das Schließen durch Enter,  \"0\","
 "\"no\",\"false\" deaktiviert es."
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ">"
-
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
-
-#: ../src/gui/socialwindow.cpp:566
-msgid "Accept Guild Invite"
-msgstr "Nehme Gildeneinladung an"
-
-#: ../src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Nehme Partyeinladung an"
-
-#: ../src/gui/socialwindow.cpp:466
-#, fuzzy, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Partyeinladung von %s angenommen."
-
-#: ../src/gui/socialwindow.cpp:447
-#, fuzzy, c-format
-msgid "Accepted party invite from %s."
-msgstr "Partyeinladung von %s angenommen."
+#: src/commandhandler.cpp:295
+msgid "Command: /toggle"
+msgstr "Befehl: /toggle"
 
-#: ../src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Akzeptiere eingehende Handelsanfragen"
+#: src/commandhandler.cpp:296
+msgid "This command displays the return toggle status."
+msgstr "Dieser Befehl zeigt, wann sich die Chatzeile schließt."
 
-#: ../src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Akzeptiere eingehende Handelsanfragen."
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Befehl: /item <Wert>"
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Zugriff verweigert. Wahrscheinlich zu viele Spieler auf dem Server."
+#: src/commandhandler.cpp:301
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+"Dieser Befehl hebt die Ignorierung des angegeben ignorierten Spieler auf."
 
-#: ../src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Account- und Charakterverwaltung"
+#: src/commandhandler.cpp:306
+msgid "Command: /where"
+msgstr "Befehl: /where"
 
-#: ../src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Account banned"
-msgstr "Account abgelaufen"
+#: src/commandhandler.cpp:307
+msgid "This command displays the name of the current map."
+msgstr "Dieser Befehl zeigt den Namen der aktuellen Karte an."
 
-#: ../src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Account banned."
-msgstr "Account abgelaufen"
+#: src/commandhandler.cpp:311
+msgid "Command: /who"
+msgstr "Befehl: /who"
 
-#: ../src/net/tmwa/loginhandler.cpp:162
-msgid "Account expired."
-msgstr "Account abgelaufen"
+#: src/commandhandler.cpp:312
+msgid "This command displays the number of players currently online."
+msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
+#: src/commandhandler.cpp:318
+msgid "Type /help for a list of commands."
+msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
 
-#: ../src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Account konnte nicht gefunden werden. Bitte melde dich erneut an."
+#: src/commandhandler.cpp:384
+msgid "Cannot send empty whispers!"
+msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
+#: src/commandhandler.cpp:392
 #, c-format
-msgid "Account: %s"
-msgstr "Account: %s"
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
+"einer, oder der Spieler bist du."
 
-#: ../src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Hinzufügen"
+#: src/commandhandler.cpp:406
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
 
-#: ../src/gui/popupmenu.cpp:171
-msgid "Add name to chat"
-msgstr "Füge Namen zu Chat hinzu"
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Name der Party fehlt."
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
-msgid "Add to chat"
-msgstr "Zu Chat hinzufügen"
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
+msgid "Please specify a name."
+msgstr "Bitte gib einen Namen an."
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Beweglichkeit"
+#: src/commandhandler.cpp:450
+msgid "Return toggles chat."
+msgstr "Enter-Taste schließt Chatzeile."
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "Beweglichkeit %+d"
+#: src/commandhandler.cpp:450
+msgid "Message closes chat."
+msgstr "Nachricht schließt Chatzeile."
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Agilität:"
+#: src/commandhandler.cpp:459
+msgid "Return now toggles chat."
+msgstr "Jetzt schließt Enter die Chatzeile."
 
-#: ../src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Handel zustimmen"
+#: src/commandhandler.cpp:463
+msgid "Message now closes chat."
+msgstr "Jetzt schließt jede Nachricht die Chatzeile."
 
-#: ../src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Zugestimmt. Warten..."
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr "IP Anzeige: An"
 
-#: ../src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "Alle"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr "IP Anzeige: Aus"
 
-#: ../src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Handeln erlauben"
+#: src/commandhandler.cpp:515
+msgid "Player already ignored!"
+msgstr "Spieler wird bereits ignoriert!"
 
-#: ../src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Flüstern erlauben"
+#: src/commandhandler.cpp:522
+#, fuzzy
+msgid "Player successfully ignored!"
+msgstr "Party erfolgreich erstellt."
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr "Bereits angemeldet"
+#: src/commandhandler.cpp:524
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr ""
+"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: ../src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Es läuft bereits eine Aufzeichnung."
+#: src/commandhandler.cpp:539
+msgid "Player wasn't ignored!"
+msgstr "Spieler wurde nicht ignoriert!"
 
-#: ../src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Hintergrundeffekte"
+#: src/commandhandler.cpp:544
+msgid "Player no longer ignored!"
+msgstr "Spieler wird nicht länger ignoriert!"
 
-#: ../src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
-msgstr "Hintergrundeffekte: %s"
+#: src/commandhandler.cpp:546
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr ""
+"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/commandhandler.h:31
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Vernichtet."
+#: src/game.cpp:172
+msgid "General"
+msgstr "Öffentlich"
 
-#: ../src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Anwenden"
+#: src/game.cpp:342
+#, fuzzy
+msgid "Screenshot saved as "
+msgstr "Bildschirmfoto wurde nach ~/ gespeichert."
 
-#: ../src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr ""
-"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
-"übernommen."
+#: src/game.cpp:347
+msgid "Saving screenshot failed!"
+msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: ../src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
+#: src/game.cpp:378
+#, fuzzy
+msgid "The connection to the server was lost."
 msgstr ""
-"Der Wechsel zu OpenGL erfordert einen Neustart. Falls mit OpenGL Grafiken "
-"fehlerhaft dargestellt werden sollten bitte das Spiel mit der "
-"Kommandozeilenoption \"--no-opengl\" neustarten."
-
-#: ../src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
+"Die Verbindung zum Server wurde getrennt, das Programm wird jetzt beendet"
 
-#: ../src/gui/socialwindow.cpp:168
-#, fuzzy, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
+#: src/game.cpp:382
+msgid "Network Error"
+msgstr "Netzwerkfehler"
 
-#: ../src/gui/socialwindow.cpp:247
-#, fuzzy, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
+#: src/game.cpp:721
+msgid "Ignoring incoming trade requests"
+msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: ../src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Zuordnen"
+#: src/game.cpp:726
+msgid "Accepting incoming trade requests"
+msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Angriff"
+#: src/game.cpp:954
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Karte konnte nicht geladen werden"
 
-#: ../src/resources/itemdb.cpp:53
+#: src/game.cpp:955
 #, c-format
-msgid "Attack %+d"
-msgstr "Angriff %+d"
+msgid "Error while loading %s"
+msgstr "Fehler beim Laden von %s"
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Angriff %+d"
-
-#: ../src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "Anwesenheitsliste wurde ins Chatprotokol geschrieben."
-
-#: ../src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Audio"
-
-#: ../src/net/tmwa/generalhandler.cpp:129
-msgid "Authentication failed."
-msgstr "Authentifizierung verweigert"
+msgid "Party: %s"
+msgstr "Party (%s)"
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
-msgstr "Abwesend"
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Kaufen"
 
-#: ../src/gui/popupmenu.cpp:100
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
-msgid "Befriend %s"
-msgstr "Sei Freund von %s"
-
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Aktionen"
-
-#: ../src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Des Lebens beraubt ruhst Du in Frieden."
+msgid "Price: %s / Total: %s"
+msgstr "Preis: %s / Gesamt: %s"
 
-#: ../src/playerrelations.cpp:342
-msgid "Blink name"
-msgstr "Blinkender Name"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
+msgid "+"
+msgstr "+"
 
-#: ../src/gui/setup_colors.cpp:138
-msgid "Blue:"
-msgstr "Blau: "
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
+msgid "-"
+msgstr "-"
 
-#: ../src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Blasen mit Namen"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Beenden"
 
-#: ../src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Blasen, keine Namen"
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
+msgid "Max"
+msgstr "Max"
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Kaufen"
+#: src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Geschäft"
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Kalibrieren"
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Verkaufen"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../src/commandhandler.cpp:422
-#, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
-"einer, oder der Spieler bist du."
-
-#: ../src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
-msgstr "Konnte keine Partie erstellen. Du bist schon in einer Partie."
-
-#: ../src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
-msgstr "Kann Skill nicht erhöhen!"
-
-#: ../src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "Kann keine leere Nachricht senden!"
-
-#: ../src/commandhandler.cpp:401
-msgid "Cannot send empty whispers!"
-msgstr "Kann keine leeren Nachrichten versenden!"
-
-#: ../src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Kann nicht rufen!"
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "E-MailAdresse ändern"
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
-msgid "Cannot use this ID."
-msgstr "Kann diese ID nicht benutzen"
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#, c-format
+msgid "Account: %s"
+msgstr "Account: %s"
 
-#: ../src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Ändern"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr "Gib die neue E-Mailadresse zweimal ein:"
 
-#: ../src/gui/charselectdialog.cpp:150
-msgid "Change Email"
-msgstr "E-Mailadresse ändern"
+#: src/gui/changeemaildialog.cpp:127
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Die neue E-Mailadresse muss aus mindestens %d Zeichen bestehen."
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Email-Adresse ändern"
+#: src/gui/changeemaildialog.cpp:134
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Die neue E-Mailadresse muss kürzer als %d Zeichen sein."
 
-#: ../src/gui/worldselectdialog.cpp:76
-#, fuzzy
-msgid "Change Login"
-msgstr "Ändern"
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr "Die neuen E-Mailadresse stimmen nicht überein."
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: ../src/gui/login.cpp:62
-msgid "Change Server"
-msgstr "Wechsle den Server"
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Passwort:"
 
-#: ../src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
+#: src/gui/changepassworddialog.cpp:63
+msgid "Type new password twice:"
+msgstr "Gib dein neues Passwort zweimal ein:"
 
-#: ../src/client.cpp:813
-#, fuzzy
-msgid "Changing game servers"
-msgstr "Wechsle den Server"
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr "Gib das alte Passwort zuerst an."
 
-#: ../src/gui/setup_video.cpp:460
-#, fuzzy
-msgid "Changing to OpenGL"
-msgstr "Ändere OpenGL"
+#: src/gui/changepassworddialog.cpp:116
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Das neue Passwort muss aus mindestens %d Zeichen bestehen."
 
-#: ../src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
-msgstr ""
-"Moderatoren können andere Spieler aus dem Kanal werfen oder ihnen ebenfalls "
-"Moderator-Rechte verleihen."
+#: src/gui/changepassworddialog.cpp:123
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Das neue Passwort muss kürzer als %d Zeichen sein."
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "Kanäle werden nicht unterstützt!"
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr "Die neues Passwörter stimmen nicht überein."
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Spieler gelöscht."
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Charakter erstellen"
 
-#: ../src/gui/statuswindow.cpp:238
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Spielfigurattribute OK"
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Name:"
 
-#: ../src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Spielfigurattribute OK"
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ">"
 
-#: ../src/net/manaserv/charhandler.cpp:143
-msgid "Character's name already exists."
-msgstr "Benutzername bereits vorhanden"
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr "<"
 
-#: ../src/net/manaserv/charhandler.cpp:155
-msgid "Character's stats are too high."
-msgstr "Spielfigurattribute sind zu groß."
+#: src/gui/charcreatedialog.cpp:74
+msgid "Hair color:"
+msgstr "Haarfarbe:"
 
-#: ../src/net/manaserv/charhandler.cpp:158
-msgid "Character's stats are too low."
-msgstr "Spielfigurattribute sind zu klein"
+#: src/gui/charcreatedialog.cpp:77
+msgid "Hair style:"
+msgstr "Frisur:"
 
-#: ../src/gui/chat.cpp:87
-msgid "Chat"
-msgstr "Chat"
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
+msgid "Create"
+msgstr "Erstellen"
 
-#: ../src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Chatfenster"
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "Männlich"
 
-#: ../src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Chat-Erstellung fehlgeschlagen!"
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "Weiblich"
 
-#: ../src/gui/charselectdialog.cpp:380
-msgid "Choose"
-msgstr "Wähle"
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Bitte verteile %d Punkte"
 
-#: ../src/gui/worldselectdialog.cpp:77
-#, fuzzy
-msgid "Choose World"
-msgstr "Wähle deinen Server"
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
-#: ../src/gui/serverdialog.cpp:196
-msgid "Choose Your Server"
-msgstr "Wähle deinen Server"
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
+msgstr "Spielfigurattribute OK"
 
-#: ../src/gui/socialwindow.cpp:544
-msgid "Choose your guild's name."
-msgstr "Wähle den Namen deiner Gilde"
+#: src/gui/charcreatedialog.cpp:256
+#, c-format
+msgid "Please remove %d points"
+msgstr "Bitte entferne %d Punkte"
 
-#: ../src/gui/socialwindow.cpp:630
-#, fuzzy
-msgid "Choose your party's name."
-msgstr "Wähle den Namen deiner Gilde"
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Bestätige Charakter-Löschung"
 
-#: ../src/gui/npcdialog.cpp:98
-msgid "Clear log"
-msgstr "Protokoll leeren"
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "Bist Du sicher, dass du diesen Charakter löschen möchtest?"
 
-#: ../src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-"Client Registrierung wurde deaktiviert. Bitte den Serveradministrator "
-"kontaktieren."
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr "Account- und Charakterverwaltung"
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr "Die Version des Spiels ist zu alt"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr "Login wechseln"
 
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
-msgid "Close"
-msgstr "Schließen"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Abmelden"
 
-#: ../src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Farben"
+#: src/gui/charselectdialog.cpp:150
+msgid "Change Email"
+msgstr "E-Mailadresse ändern"
 
-#: ../src/commandhandler.cpp:221
-msgid "Command: /announce <msg>"
-msgstr "Befehl: /announce <Nachricht>"
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Löschen"
 
-#: ../src/commandhandler.cpp:274
-#, fuzzy
-msgid "Command: /away"
-msgstr "Befehl: /who"
+#: src/gui/charselectdialog.cpp:380
+msgid "Choose"
+msgstr "Wähle"
 
-#: ../src/commandhandler.cpp:271
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Befehl: /w <Name> <Nachricht>"
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
+msgid "(empty)"
+msgstr "(leer)"
 
-#: ../src/commandhandler.cpp:228
-msgid "Command: /clear"
-msgstr "Befehl: /clear"
+#: src/gui/chat.cpp:88
+msgid "Chat"
+msgstr "Chat"
 
-#: ../src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Befehl: /close"
+#: src/gui/chat.cpp:311
+#, c-format
+msgid "Present: %s; %d players are present."
+msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: ../src/commandhandler.cpp:279
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Befehl: /create <Party-Name>"
+#: src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Anwesenheitsliste wurde ins Chatprotokol geschrieben."
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Befehl: /exp"
+#: src/gui/chat.cpp:493
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Flüsternd zu %s: %s"
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Befehl: /exp <Wert>"
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Ja"
 
-#: ../src/commandhandler.cpp:209
-msgid "Command: /help"
-msgstr "Befehl: /help"
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Nein"
 
-#: ../src/commandhandler.cpp:212
-msgid "Command: /help <command>"
-msgstr "Befehl: /help <Befehl>"
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr "Debug"
 
-#: ../src/gui/widgets/whispertab.cpp:88
-#, fuzzy
-msgid "Command: /ignore"
-msgstr "Befehl: /item"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr "%d FPS (OpenGL)"
 
-#: ../src/commandhandler.cpp:233
-msgid "Command: /ignore <player>"
-msgstr "Befehl: /item <Wert>"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr "%d FPS"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Befehl: /invite <Name>"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
+msgstr "Musik: %s"
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Befehl: /item"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, c-format
+msgid "Map: %s"
+msgstr "Karte : %s"
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Befehl: /item <Wert>"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
+msgstr "Ãœbersichtskarte: %s"
 
-#: ../src/commandhandler.cpp:239
-msgid "Command: /join <channel>"
-msgstr "Befehl: /join <Kanal>"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr "Cursor: (%d, %d)"
 
-#: ../src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Befehl: /kick <Name>"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
+msgstr "Partikelzählung: %d"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Befehl: /leave"
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
+msgstr "Partikeldetails: %s"
 
-#: ../src/commandhandler.cpp:245
-msgid "Command: /list"
-msgstr "Befehl: /list"
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
+msgstr "Hintergrundeffekte: %s"
 
-#: ../src/commandhandler.cpp:250
-msgid "Command: /me <message>"
-msgstr "Befehl: /me <Nachricht>"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Ausrüstung"
 
-#: ../src/commandhandler.cpp:255
-msgid "Command: /msg <nick> <message>"
-msgstr "Befehl: /msg <Name> <Nachricht>"
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
+msgid "Unequip"
+msgstr "Ablegen"
 
-#: ../src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Befehl: /op <Name>"
+#: src/gui/help.cpp:37
+msgid "Help"
+msgstr "Hilfe"
 
-#: ../src/commandhandler.cpp:284
-msgid "Command: /party <nick>"
-msgstr "Befehl: /party <Name>"
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
+msgid "Close"
+msgstr "Schließen"
 
-#: ../src/commandhandler.cpp:291
-msgid "Command: /present"
-msgstr "Befehl: /present"
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inventar"
 
-#: ../src/commandhandler.cpp:265
-msgid "Command: /q <nick>"
-msgstr "Befehl: /q <Name>"
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Lager"
 
-#: ../src/commandhandler.cpp:264
-msgid "Command: /query <nick>"
-msgstr "Befehl: /query <Name>"
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Plätze:"
 
-#: ../src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Befehl: /quit"
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
+msgid "Equip"
+msgstr "Ausrüsten"
 
-#: ../src/commandhandler.cpp:301
-msgid "Command: /record"
-msgstr "Befehl: /record"
+#: src/gui/inventorywindow.cpp:88
+msgid "Use"
+msgstr "Benutzen"
 
-#: ../src/commandhandler.cpp:298
-msgid "Command: /record <filename>"
-msgstr "Befehl: /record <Dateiname>"
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
 
-#: ../src/commandhandler.cpp:312
-msgid "Command: /toggle"
-msgstr "Befehl: /toggle"
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
+msgid "Drop..."
+msgstr "Wegwerfen"
 
-#: ../src/commandhandler.cpp:306
-msgid "Command: /toggle <state>"
-msgstr "Befehl: /toggle <Status>"
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
+msgid "Split"
+msgstr "Aufteilen"
 
-#: ../src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Befehl: /topic <Thema>"
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr "Ausrüstung"
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Befehl: /item <Wert>"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
+msgstr "Gewicht:"
 
-#: ../src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Befehl: /users"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Einlagern"
 
-#: ../src/commandhandler.cpp:257
-msgid "Command: /w <nick> <message>"
-msgstr "Befehl: /w <Name> <Nachricht>"
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Abholen"
 
-#: ../src/commandhandler.cpp:323
-msgid "Command: /where"
-msgstr "Befehl: /where"
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
+msgid "Drop"
+msgstr "Wegwerfen"
 
-#: ../src/commandhandler.cpp:256
-msgid "Command: /whisper <nick> <message>"
-msgstr "Befehl: /whisper <Name> <Nachricht>"
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
+msgid "OK"
+msgstr "Ok"
 
-#: ../src/commandhandler.cpp:328
-msgid "Command: /who"
-msgstr "Befehl: /who"
+#: src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Alle"
 
-#: ../src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Fertig"
+#: src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
 
-#: ../src/playerrelations.cpp:312
-msgid "Completely ignore"
-msgstr "@@ignore|Ignoriere %s komplett@@"
+#: src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
 
-#: ../src/gui/popupmenu.cpp:117
-#, c-format
-msgid "Completely ignore %s"
-msgstr "Ignoriere %s komplett"
+#: src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Wähle aus, wie viele Gegenstände Du einlagern möchtest."
 
-#: ../src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Bestätige Charakter-Löschung"
+#: src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Wähle aus, wie viele Gegenstände Du wieder haben möchtest."
 
-#: ../src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Bestätigen:"
+#: src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Wähle aus, wie viel Gegenstände Du aufteilen möchtest."
 
-#: ../src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Bestätigt. Warten..."
+#: src/gui/itempopup.cpp:137
+#, c-format
+msgid "Weight: %s"
+msgstr "Gewicht: %s"
 
-#: ../src/keyboardconfig.cpp:184
-#, fuzzy, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
+msgid "Login"
+msgstr "Anmelden"
 
-#: ../src/gui/serverdialog.cpp:233
-msgid "Connect"
-msgstr "Verbinde..."
+#: src/gui/login.cpp:60
+msgid "Remember username"
+msgstr "Benutzername merken"
 
-#: ../src/client.cpp:655
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Verbinde mit [Benutzerdatenserver]..."
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "Registrieren"
+
+#: src/gui/login.cpp:62
+msgid "Change Server"
+msgstr "Wechsle den Server"
 
-#: ../src/client.cpp:803
+#: src/gui/login.cpp:129
 #, fuzzy
-msgid "Connecting to the game server"
-msgstr "Verbinde mit [Charakterserver]..."
+msgid "Registration disabled"
+msgstr "Teilen von Gegenständen deaktiviert."
 
-#: ../src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Verbinde..."
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr "Du musst auf der Webseite ein Konto für diesen Server erstellen."
 
-#: ../src/net/tmwa/network.cpp:414
-msgid "Connection to server terminated. "
-msgstr "Verbindung mit Server abgebrochen. "
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Karte"
 
-#: ../src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr "Ausrüstung kopieren"
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr "Muss"
 
-#: ../src/gui/statuswindow.cpp:244
-#, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Fähigkeitspunkte: %d"
+#: src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Warte auf den Server"
 
-#: ../src/game.cpp:950
-#, fuzzy
-msgid "Could Not Load Map"
-msgstr "Karte konnte nicht geladen werden"
+#: src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Weiter"
 
-#: ../src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "Konnte Party nicht erstellen."
+#: src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Absenden"
 
-#: ../src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
-msgstr "Konnte User nicht in Gilde einladen."
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: ../src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Kann der Gruppe nicht beitreten!"
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr "Protokoll leeren"
 
-#: ../src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "Konnte nichts stehlen..."
+#: src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Zurücksetzten"
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Erstellen"
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:208
+msgid ""
+"\n"
+"> Next\n"
+msgstr ""
+"\n"
+"Weiter\n"
 
-#: ../src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Charakter erstellen"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Nach:"
 
-#: ../src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Gilde erstellen"
+#: src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Senden"
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
-#, fuzzy
-msgid "Create Party"
-msgstr "Charakter erstellen"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Es misslang den Brief zu senden oder er war ungültig."
 
-#: ../src/gui/socialwindow.cpp:507
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
 #, c-format
-msgid "Creating guild called %s."
-msgstr "Erstelle der Gilde %s."
+msgid "Outfit: %d"
+msgstr "Ausrüstung: %d"
 
-#: ../src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
-msgstr "Gilde konnte nicht erstellt werden, bitte einen kürzen Namen wählen."
+#: src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr "erstes ausziehen"
 
-#: ../src/gui/socialwindow.cpp:529
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
-msgid "Creating party called %s."
-msgstr "Erstelle der Gilde %s."
+msgid "Trade with %s..."
+msgstr "Handele mit %s"
 
-#: ../src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
-msgstr "Partie konte nicht erstellt werden, bitte einen kürzeren Namen wählen."
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Angriff %+d"
 
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Kritischer Treffer"
+#: src/gui/popupmenu.cpp:91
+#, c-format
+msgid "Whisper %s"
+msgstr "flüstere %s"
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/popupmenu.cpp:100
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Cursor: (%d, %d)"
+msgid "Befriend %s"
+msgstr "Sei Freund von %s"
 
-#: ../src/gui/serverdialog.cpp:234
-#, fuzzy
-msgid "Custom Server"
-msgstr "Benutzerdefinierter Zeiger"
+#: src/gui/popupmenu.cpp:105
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Unbeachtet"
 
-#: ../src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "Benutzerdefinierter Zeiger"
+#: src/gui/popupmenu.cpp:108
+#, c-format
+msgid "Ignore %s"
+msgstr "Ignoriere %s"
 
-#: ../src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
-msgstr "Deaktiviere OpenGL"
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
+msgstr "Ignoriere %s nicht mehr"
 
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr "Debug"
+#: src/gui/popupmenu.cpp:117
+#, c-format
+msgid "Completely ignore %s"
+msgstr "Ignoriere %s komplett"
 
-#: ../src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Debugfenster"
+#: src/gui/popupmenu.cpp:130
+#, c-format
+msgid "Invite %s to join your guild"
+msgstr "Lade %s in deine Gilde ein"
 
-#: ../src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Standard"
+#: src/gui/popupmenu.cpp:134
+#, c-format
+msgid "Invite %s to join your party"
+msgstr "Lade %s in deine Party ein"
 
-#: ../src/net/tmwa/generalhandler.cpp:225
-msgid "Defense"
-msgstr "Verteidigung:"
+#: src/gui/popupmenu.cpp:141
+msgid "Kick player"
+msgstr "Spieler rauswerfen"
 
-#: ../src/resources/itemdb.cpp:54
+#: src/gui/popupmenu.cpp:150
 #, c-format
-msgid "Defense %+d"
-msgstr "Verteidigung %+d"
-
-#: ../src/gui/setup_colors.cpp:93
-msgid "Delay:"
-msgstr "Verzögerung: "
+msgid "Talk to %s"
+msgstr "Rede mit %s"
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Löschen"
+#: src/gui/popupmenu.cpp:163
+msgid "Kick monster"
+msgstr "Monster töten"
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Ausdauer"
+#: src/gui/popupmenu.cpp:171
+msgid "Add name to chat"
+msgstr "Füge Namen zu Chat hinzu"
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: src/gui/popupmenu.cpp:188
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Ausdauer %+d"
-
-#: ../src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Geschicklichkeit:"
-
-#: ../src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
-msgstr "Transparenz deaktivieren (für langsame PCs)"
+msgid "Pick up %s"
+msgstr "Hebe %s auf"
 
-#: ../src/gui/popupmenu.cpp:105
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "Unbeachtet"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
+msgid "Add to chat"
+msgstr "Zu Chat hinzufügen"
 
-#: ../src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Unbeachtet"
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Server wechseln"
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Spielfigur wechseln"
 
-#: ../src/gui/setup_audio.cpp:43
-msgid "Download music"
-msgstr "Lade Musik herunter"
+#: src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Aufzeichnung abgeschlossen."
 
-#: ../src/gui/serverdialog.cpp:442
-#, c-format
-msgid "Downloading server list...%2.2f%%"
-msgstr "Lade Serverliste herunter...%2.2f%%"
+#: src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Es läuft keine Aufzeichnung."
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
-msgid "Drop"
-msgstr "Wegwerfen"
+#: src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Es läuft bereits eine Aufzeichnung."
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
-msgid "Drop..."
-msgstr "Wegwerfen"
+#: src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Starte Aufzeichnung..."
 
-#: ../src/net/tmwa/generalhandler.cpp:145
-msgid "Duplicated login."
-msgstr "Mehrfache Anmeldung"
+#: src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Start der Aufzeichnung fehlgeschlagen."
 
-#: ../src/client.cpp:905
-msgid "Email Change"
-msgstr "E-Mail ändern"
+#: src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Aufzeichnung läuft..."
 
-#: ../src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr "E-Mailadresse bereits vorhanden"
+#: src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Stoppe Aufzeichnung"
 
-#: ../src/client.cpp:906
-#, fuzzy
-msgid "Email changed successfully!"
-msgstr "Mitglied wurde erfolgreich Befördert."
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Bestätigen:"
 
-#: ../src/gui/register.cpp:100
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "eMail:"
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
+#: src/gui/register.cpp:166
 #, c-format
-msgid "Emote Shortcut %d"
-msgstr "Gefühlstaste %d"
-
-#: ../src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr "Kurztasten für Gefühle"
-
-#: ../src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Emote fehlgeschlagen!"
+msgid "The username needs to be at least %d characters long."
+msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
 
-#: ../src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr "Empty address given to Network::connect()!"
+#: src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
 
-#: ../src/gui/setup_joystick.cpp:39
-msgid "Enable joystick"
-msgstr "Joystick aktivieren"
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Das Passwort muss aus mindestens %d Zeichen bestehen."
 
-#: ../src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Handeln erlauben/verbieten"
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 
-#: ../src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr "Ende der Channel-Liste."
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Passwörter stimmen nicht überein."
 
-#: ../src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr "Gib das alte Passwort zuerst an."
+#: src/gui/serverdialog.cpp:197
+msgid "Choose Your Server"
+msgstr "Wähle deinen Server"
 
-#: ../src/client.cpp:715
-msgid "Entering game world"
-msgstr "Betrete die Spielwelt"
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Server:"
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
-msgid "Equip"
-msgstr "Ausrüsten"
+#: src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Port:"
 
-#: ../src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
-msgstr "Rüste dich zuerst mit Pfeilen aus."
+#: src/gui/serverdialog.cpp:208
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Ausrüstung"
+#: src/gui/serverdialog.cpp:229
+msgid "Connect"
+msgstr "Verbinde..."
 
-#: ../src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Ausrüstungsfenster"
+#: src/gui/serverdialog.cpp:230
+#, fuzzy
+msgid "Custom Server"
+msgstr "Benutzerdefinierter Zeiger"
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "Fehler"
+#: src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
-#: ../src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Fehler beim Erstellen der Gilde."
+#: src/gui/serverdialog.cpp:441
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
-msgid "Error creating updates directory!"
-msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
+#: src/gui/serverdialog.cpp:447
+msgid "Waiting for server..."
+msgstr "Warte auf den Server"
 
-#: ../src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr "Fehler beim Betreten des Kanals."
+#: src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr "Download wird vorbereitet"
 
-#: ../src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 #, fuzzy
 msgid "Error retreiving server list!"
 msgstr "Fehler beim empfangen der Serverliste: %s\n"
 
-#: ../src/game.cpp:951
-#, c-format
-msgid "Error while loading %s"
-msgstr "Fehler beim Laden von %s"
-
-#: ../src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr "benötigt eine neuere Version"
 
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "Anzeige der Erfahrungspunkte"
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr "benötigt v%s"
 
-#: ../src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "Exp:"
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Ton"
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr "Teilen der Erfahrungspunkte deaktiviert."
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr "Lade Musik herunter"
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr "Teilen der Erfahrungspunkte aktiviert."
+#: src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Audio"
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr "Teilen der Erfahrungspunkte nicht möglich."
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Lautstärke der Klangeffekte"
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
-#, fuzzy
-msgid "Experience sharing unknown."
-msgstr "Teilen der Erfahrungspunkte aktiviert."
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Lautstärke der Musik"
 
-#: ../src/gui/setup_video.cpp:238
+#: src/gui/setup_audio.cpp:94
 #, fuzzy
-msgid "FPS limit:"
-msgstr "FPS-Limit:"
-
-#: ../src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
+msgid "Notice"
+msgstr "Kein Text"
 
-#: ../src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
 msgstr ""
-"Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen freien "
-"Platz mehr."
+"Der Client muss neugestartet werden, wenn die neue Musik heruntergeladen "
+"werden soll"
 
-#: ../src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
-"Gegenstand konnte nicht hinzugefügt werden. Handelspartner ist überladen."
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr "Soundengine"
 
-#: ../src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
-"Gegenstände hinzufügen."
+#: src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "So wird die Farbe aussehen"
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Charakter konnte nicht erstellt werden. Wahrscheinlich ist der Name bereits "
-"vergeben."
+#: src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Farben"
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "Spieler konnte nicht gelöscht werden."
+#: src/gui/setup_colors.cpp:72
+msgid "Type:"
+msgstr "Typ: "
 
-#: ../src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Beförderung des Mitglieds gescheitert."
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Statisch"
 
-#: ../src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "Es misslang den Brief zu senden oder er war ungültig."
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Pulsierend"
 
-#: ../src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Start der Aufzeichnung fehlgeschlagen."
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Regenbogen"
 
-#: ../src/gui/setup_video.cpp:434
-#, fuzzy
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "und Wiederherstellung der alten Auflösung schlug fehl!"
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Spektrum"
 
-#: ../src/gui/setup_video.cpp:428
-#, fuzzy
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "und Wiederherstellung der alten Auflösung schlug fehl!"
+#: src/gui/setup_colors.cpp:94
+msgid "Delay:"
+msgstr "Verzögerung: "
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
-msgid "Failed to use item."
-msgstr "Gegenstand konnte nicht benutzt werden."
+#: src/gui/setup_colors.cpp:109
+msgid "Red:"
+msgstr "Rot: "
 
-#: ../src/client.cpp:927
-msgid "Farewell, come back any time..."
-msgstr "Leb wohl und komme jeder Zeit wieder..."
+#: src/gui/setup_colors.cpp:124
+msgid "Green:"
+msgstr "Grün: "
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
-msgid "Female"
-msgstr "Weiblich"
+#: src/gui/setup_colors.cpp:139
+msgid "Blue:"
+msgstr "Blau: "
 
-#: ../src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "Finde Weg zum Mauszeiger"
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Anwenden"
 
-#: ../src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Aufzeichnung abgeschlossen."
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Fenster zurücksetzen"
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr "Schwebende '...' Blase"
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Knopf drücken, um die Kalibrierung zu starten"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr "Schwebende Blase"
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Kalibrieren"
 
-#: ../src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Schriftgröße"
+#: src/gui/setup_joystick.cpp:39
+msgid "Enable joystick"
+msgstr "Joystick aktivieren"
 
-#: ../src/commandhandler.cpp:205
-msgid "For more information, type /help <command>."
-msgstr "Für mehr Informationen, gib /help <Befehl> ein."
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: ../src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Freund"
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Stopp"
 
-#: ../src/gui/setup_video.cpp:219
-msgid "Full screen"
-msgstr "Vollbild"
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Kreise den Steuerknüppel"
 
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "Namen von GM"
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Tastatur"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
-msgid "Game"
-msgstr "Spiel"
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Zuordnen"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Game Over!"
+#: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Zuordnen"
 
-#: ../src/game.cpp:169
-msgid "General"
-msgstr "Öffentlich"
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Standard"
 
-#: ../src/gui/widgets/chattab.cpp:126
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Globale Ansage von %s:"
+#: src/gui/setup_keyboard.cpp:125
+#, fuzzy
+msgid "Key Conflict(s) Detected."
+msgstr "Tastenkonflikte entdeckt."
 
-#: ../src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Globale Ansage:"
+#: src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Name"
 
-#: ../src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
-msgstr "Verbindung zum Server unterbrochen!"
+#: src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Beziehung"
 
-#: ../src/gui/setup_colors.cpp:123
-msgid "Green:"
-msgstr "Grün: "
+#: src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutral"
 
-#: ../src/gui/setup_video.cpp:261
-msgid "Gui opacity"
-msgstr "GUI Transparenz"
+#: src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Freund"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Gilde"
+#: src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Unbeachtet"
 
-#: ../src/gui/socialwindow.cpp:143
-#, fuzzy, c-format
-msgid "Guild %s quit requested."
-msgstr "Gilde %s wurde aufgelöst."
+#: src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Ignoriert"
 
-#: ../src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Gildenname"
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
+msgid "???"
+msgstr "???"
 
-#: ../src/gui/socialwindow.cpp:543
-msgid "Guild Name"
-msgstr "Gildenname"
+#: src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Handeln erlauben"
 
-#: ../src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Gilde erstellt."
+#: src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Flüstern erlauben"
 
-#: ../src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
-msgstr "Gildenerstellung wird nocht nicht unterstützt."
+#: src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Alle privaten Nachrichten in Tabs öffnen"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
+#: src/gui/setup_players.cpp:233
 #, fuzzy
-msgid "Guild name is missing."
-msgstr "Name der Party fehlt."
+msgid "Show gender"
+msgstr "Geschlecht"
 
-#: ../src/gui/statuswindow.cpp:203
+#: src/gui/setup_players.cpp:235
 #, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: ../src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
-
-#: ../src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "HP:"
+msgid "Enable Chat log"
+msgstr "Verkauf fehlgeschlagen."
 
-#: ../src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
-msgstr "Haarfarbe:"
+#: src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Spieler"
 
-#: ../src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
-msgstr "Frisur:"
+#: src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "Wenn ignorierend:"
 
-#: ../src/gui/help.cpp:37
-msgid "Help"
-msgstr "Hilfe"
+#: src/gui/setup_video.cpp:134
+msgid "Tiny"
+msgstr "Winzig"
 
-#: ../src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Hilfefenster"
+#: src/gui/setup_video.cpp:135
+msgid "Small"
+msgstr "Klein"
 
-#: ../src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Fenster ausblenden"
+#: src/gui/setup_video.cpp:136
+msgid "Medium"
+msgstr "Mittel"
 
-#: ../src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Eha? Was ist das?"
+#: src/gui/setup_video.cpp:137
+msgid "Large"
+msgstr "Groß"
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Ich glaube, das war nicht so gut."
+#: src/gui/setup_video.cpp:163
+msgid "No text"
+msgstr "Kein Text"
 
-#: ../src/commandhandler.cpp:241
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Falls Kanal <Kanal> nicht existiert, wird er erstellt."
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Text"
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
-"(\")."
+#: src/gui/setup_video.cpp:165
+msgid "Bubbles, no names"
+msgstr "Blasen, keine Namen"
 
-#: ../src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
-"Wenn Du nicht so lebendig wärst, könntest Du die Gänseblümchen von unten "
-"sehen."
+#: src/gui/setup_video.cpp:166
+msgid "Bubbles with names"
+msgstr "Blasen mit Namen"
 
-#: ../src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Wenn Du die letzte Person im Kanal bist, wird dieser gelöscht."
+#: src/gui/setup_video.cpp:178
+msgid "off"
+msgstr "Aus"
 
-#: ../src/gui/popupmenu.cpp:108
-#, c-format
-msgid "Ignore %s"
-msgstr "Ignoriere %s"
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
+msgid "low"
+msgstr "Niedrig"
 
-#: ../src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "Ignoriere Eingabe 1"
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
+msgid "high"
+msgstr "Hoch"
 
-#: ../src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "Ignoriere Eingabe 2"
+#: src/gui/setup_video.cpp:193
+msgid "medium"
+msgstr "Mittel"
 
-#: ../src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Ignoriert"
+#: src/gui/setup_video.cpp:195
+msgid "max"
+msgstr "Maximal"
 
-#: ../src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Ignoriere eingehende Handelsanfragen"
+#: src/gui/setup_video.cpp:217
+msgid "Full screen"
+msgstr "Vollbild"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignoriere eingehende Handelsanfragen."
+#: src/gui/setup_video.cpp:218
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Info"
+#: src/gui/setup_video.cpp:219
+msgid "Custom cursor"
+msgstr "Benutzerdefinierter Zeiger"
 
-#: ../src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "Gib eine Münze ein um weiter zuspielen."
+#: src/gui/setup_video.cpp:221
+msgid "Visible names"
+msgstr "Sichtbare Namen"
 
-#: ../src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "Nicht genug HP!"
+#: src/gui/setup_video.cpp:223
+msgid "Particle effects"
+msgstr "Partikeleffekte"
 
-#: ../src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "Nicht genug SP!"
+#: src/gui/setup_video.cpp:225
+#, fuzzy
+msgid "Show own name"
+msgstr "Eigener Name"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Intelligenz"
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr "Protokoliere NPC Gespräche"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligenz %+d"
+#: src/gui/setup_video.cpp:227
+msgid "Show pickup notification"
+msgstr "Benachrichtigung beim Aufheben"
 
-#: ../src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Intelligenz:"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
+msgid "in chat"
+msgstr "im Chatfenster"
 
-#: ../src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
-msgstr "Ungültiges Geschlecht."
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
+msgid "as particle"
+msgstr "als Partikeleffekt"
 
-#: ../src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
-msgstr "Ungültige Haarfarbe."
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "FPS limit:"
+msgstr "FPS-Limit:"
 
-#: ../src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
-msgstr "Ungültiger Haarstil."
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr "Transparenz deaktivieren (für langsame PCs)"
 
-#: ../src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
-msgstr "Ungültiger Name."
+#: src/gui/setup_video.cpp:250
+msgid "Video"
+msgstr "Video"
 
-#: ../src/client.cpp:1244
-#, fuzzy, c-format
-msgid "Invalid update host: %s"
-msgstr "Ungültiger Updateserver: "
+#: src/gui/setup_video.cpp:252
+#, fuzzy
+msgid "Show damage"
+msgstr "Eigener Name"
 
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inventar"
+#: src/gui/setup_video.cpp:258
+msgid "Overhead text"
+msgstr "Chat über Spielern"
 
-#: ../src/keyboardconfig.cpp:72
-msgid "Inventory Window"
-msgstr "Inventarfenster"
+#: src/gui/setup_video.cpp:259
+msgid "Gui opacity"
+msgstr "GUI-Transparenz"
 
-#: ../src/localplayer.cpp:1254
-#, fuzzy
-msgid "Inventory is full."
-msgstr "Server ist voll"
+#: src/gui/setup_video.cpp:260
+msgid "Ambient FX"
+msgstr "Hintergrundeffekte"
 
-#: ../src/gui/socialwindow.cpp:334
+#: src/gui/setup_video.cpp:261
 #, fuzzy
-msgid "Invite"
-msgstr "einladen"
-
-#: ../src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Invite %s to join your guild"
-msgstr "Lade %s in deine Gilde ein"
+msgid "Particle detail"
+msgstr "Partikeldetail"
 
-#: ../src/gui/popupmenu.cpp:134
-#, c-format
-msgid "Invite %s to join your party"
-msgstr "Lade %s in deine Party ein"
+#: src/gui/setup_video.cpp:262
+msgid "Font size"
+msgstr "Schriftgröße"
 
-#: ../src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Einladung gesendet."
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
+#, fuzzy
+msgid "None"
+msgstr "Nein"
 
-#: ../src/gui/socialwindow.cpp:128
-#, fuzzy, c-format
-msgid "Invited user %s to guild %s."
-msgstr "Spieler %s einladen"
+#: src/gui/setup_video.cpp:426
+#, fuzzy
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "Auflösung und Wiederherstellung der alten Auflösung schlug fehl!"
 
-#: ../src/net/tmwa/partyhandler.cpp:335
-#, fuzzy, c-format
-msgid "Invited user %s to party."
-msgstr "Spieler %s einladen"
+#: src/gui/setup_video.cpp:432
+#, fuzzy
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr "Auflösung und Wiederherstellung der alten Auflösung schlug fehl!"
 
-#: ../src/net/tmwa/partyhandler.cpp:340
-#, c-format
-msgid "Inviting failed, because you can't see a player called %s."
-msgstr "Einladung fehlgeschlagen, da du den Spieler %s nicht sehen kannst."
+#: src/gui/setup_video.cpp:443
+#, fuzzy
+msgid "Switching to Full Screen"
+msgstr "Wechsle zum Vollbildmodus"
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Kurztaste %d"
+#: src/gui/setup_video.cpp:444
+msgid "Restart needed for changes to take effect."
+msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: ../src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Kurztastenfenster"
+#: src/gui/setup_video.cpp:458
+#, fuzzy
+msgid "Changing to OpenGL"
+msgstr "Ändere OpenGL"
 
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
+"Der Wechsel zu OpenGL erfordert einen Neustart. Falls mit OpenGL Grafiken "
+"fehlerhaft dargestellt werden sollten bitte das Spiel mit der "
+"Kommandozeilenoption \"--no-opengl\" neustarten."
 
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
-msgstr ""
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr "Deaktiviere OpenGL"
 
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
+#: src/gui/setup_video.cpp:467
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
+"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
+"übernommen."
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Teilen von Gegenständen deaktiviert."
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Teilen der Erfahrungspunkte deaktiviert."
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Teilen von Gegenständen aktiviert."
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr "Bitte neustarten um Änderungen zu übernehmen."
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "Teilen von Gegenständen nicht möglich."
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr "Transparenz aktiviert."
 
-#: ../src/net/tmwa/gui/partytab.cpp:141
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
-msgid "Item sharing unknown."
-msgstr "Teilen von Gegenständen aktiviert."
+msgid "Screen Resolution Changed"
+msgstr "Auflösung geändert"
 
-#: ../src/gui/statuswindow.cpp:234
-#, fuzzy
-msgid "Job"
-msgstr "Job:"
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
+msgid "Restart your client for the change to take effect."
+msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
 
-#: ../src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Job:"
+#: src/gui/setup_video.cpp:579
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
+"Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
+"anzupassen."
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
-#, c-format
-msgid "Job: %d"
-msgstr "Job: %d"
+#: src/gui/setup_video.cpp:612
+#, fuzzy
+msgid "Particle Effect Settings Changed."
+msgstr "Partikeleffekteinstellungen geändert."
 
-#: ../src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Der Party beigetreten."
+#: src/gui/setup_video.cpp:613
+msgid "Changes will take effect on map change."
+msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
-#: ../src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Fertigkeiten"
 
-#: ../src/gui/setup_keyboard.cpp:125
-#, fuzzy
-msgid "Key Conflict(s) Detected."
-msgstr "Tastenkonflikte entdeckt."
+#: src/gui/skilldialog.cpp:223
+msgid "Up"
+msgstr "Erhöhen"
 
-#: ../src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Tastatur"
+#: src/gui/skilldialog.cpp:269
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Fähigkeitspunkte: %d"
 
-#: ../src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
+#: src/gui/skilldialog.cpp:351
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Fähigkeitspunkte: %d"
 
-#: ../src/gui/popupmenu.cpp:163
-msgid "Kick monster"
-msgstr "Monster töten"
+#: src/gui/skilldialog.cpp:360
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Fertigkeiten"
 
-#: ../src/gui/popupmenu.cpp:141
-msgid "Kick player"
-msgstr "Spieler rauswerfen"
+#: src/gui/skilldialog.cpp:442
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Stufe: %d"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Spieler aus dem Kanal geworfen!"
+#: src/gui/skilldialog.cpp:453
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Stufe: %d"
 
-#: ../src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Groß"
+#: src/gui/socialwindow.cpp:126
+#, fuzzy, c-format
+msgid "Invited user %s to guild %s."
+msgstr "Spieler %s einladen"
+
+#: src/gui/socialwindow.cpp:139
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Gilde %s wurde aufgelöst."
 
-#: ../src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:153
 #, fuzzy
-msgid "Leave"
-msgstr "Stufe: %d"
+msgid "Member Invite to Guild"
+msgstr "Spieler einladen"
 
-#: ../src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:154
+#, fuzzy, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr "Wen möchtest du einladen?"
+
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Gilde erstellen"
 
-#: ../src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
-msgstr "Partie verlassen?"
+#: src/gui/socialwindow.cpp:164
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
 
-#: ../src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Stufe: %d"
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "Spieler %s einladen"
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/socialwindow.cpp:218
 #, c-format
-msgid "Level: %d"
-msgstr "Stufe: %d"
-
-#: ../src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr "Liste Kanäle"
+msgid "Party %s quit requested."
+msgstr "Partie %s Auflösung beauftragt."
 
-#: ../src/gui/userpalette.cpp:109
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Kritischer Treffer"
+msgid "Member Invite to Party"
+msgstr "Spieler einladen"
+
+#: src/gui/socialwindow.cpp:233
+#, fuzzy, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr "Wen möchtest du einladen?"
+
+#: src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
+msgstr "Partie verlassen?"
+
+#: src/gui/socialwindow.cpp:243
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
 
-#: ../src/gui/userpalette.cpp:107
+#: src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Gilde erstellen"
+
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "Spieler trifft Monster"
+msgid "Create Party"
+msgstr "Charakter erstellen"
 
-#: ../src/gui/userpalette.cpp:111
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 #, fuzzy
-msgid "Local Player Miss"
-msgstr "Spielerliste sichern"
+msgid "Social"
+msgstr "Special"
 
-#: ../src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
-msgstr "Protokoliere NPC Gespräche"
+#: src/gui/socialwindow.cpp:330
+#, fuzzy
+msgid "Invite"
+msgstr "einladen"
 
-#: ../src/client.cpp:682
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
-msgid "Logging in"
-msgstr "Anmelden"
+msgid "Leave"
+msgstr "Stufe: %d"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
-msgid "Login"
-msgstr "Anmelden"
+#: src/gui/socialwindow.cpp:443
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Partyeinladung von %s angenommen."
 
-#: ../src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr "Anmeldeversuch zu früh nach vorherigem Versuch."
+#: src/gui/socialwindow.cpp:449
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Partyeinladung von %s abgelehnt."
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
+#: src/gui/socialwindow.cpp:462
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Partyeinladung von %s angenommen."
 
-#: ../src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Glück"
+#: src/gui/socialwindow.cpp:468
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Partyeinladung von %s abgelehnt."
 
-#: ../src/net/tmwa/generalhandler.cpp:106
-#, c-format
-msgid "Luck %+d"
-msgstr "Glück %+d"
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr "Gilde konnte nicht erstellt werden, bitte einen kürzen Namen wählen."
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Glück:"
+#: src/gui/socialwindow.cpp:504
+#, c-format
+msgid "Creating guild called %s."
+msgstr "Erstelle der Gilde %s."
 
-#: ../src/gui/skilldialog.cpp:455
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Stufe: %d"
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr "Partie konte nicht erstellt werden, bitte einen kürzeren Namen wählen."
 
-#: ../src/gui/skilldialog.cpp:444
+#: src/gui/socialwindow.cpp:527
 #, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Stufe: %d"
+msgid "Creating party called %s."
+msgstr "Erstelle der Gilde %s."
 
-#: ../src/net/tmwa/generalhandler.cpp:226
-msgid "M.Attack"
-msgstr "M.Angriff:"
+#: src/gui/socialwindow.cpp:541
+msgid "Guild Name"
+msgstr "Gildenname"
 
-#: ../src/net/tmwa/generalhandler.cpp:227
-msgid "M.Defense"
-msgstr "M.Verteidigung:"
+#: src/gui/socialwindow.cpp:542
+msgid "Choose your guild's name."
+msgstr "Wähle den Namen deiner Gilde"
 
-#: ../src/gui/statuswindow.cpp:209
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
-msgid "MP"
-msgstr "MP:"
+msgid "Received guild request, but one already exists."
+msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: ../src/resources/itemdb.cpp:56
+#: src/gui/socialwindow.cpp:559
 #, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+msgid "%s has invited you to join the guild %s."
+msgstr "%s hat Dich eingeladen, seiner Gilde %s beizutreten."
 
-#: ../src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "MP:"
+#: src/gui/socialwindow.cpp:564
+msgid "Accept Guild Invite"
+msgstr "Nehme Gildeneinladung an"
 
-#: ../src/net/tmwa/chathandler.cpp:190
-msgid "MVP player."
-msgstr "Spieler"
+#: src/gui/socialwindow.cpp:576
+msgid "Received party request, but one already exists."
+msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
-msgid "Male"
-msgstr "Männlich"
+#: src/gui/socialwindow.cpp:585
+#, fuzzy
+msgid "You have been invited you to join a party."
+msgstr "%s hat dich in seine Party eingeladen."
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Karte"
+#: src/gui/socialwindow.cpp:589
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: src/gui/socialwindow.cpp:597
 #, c-format
-msgid "Map: %s"
-msgstr "Karte : %s"
+msgid "%s has invited you to join their party."
+msgstr "%s hat dich in seine Party eingeladen."
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Max"
+#: src/gui/socialwindow.cpp:602
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
 
-#: ../src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Mittel"
+#: src/gui/socialwindow.cpp:610
+msgid "Accept Party Invite"
+msgstr "Nehme Partyeinladung an"
 
-#: ../src/gui/socialwindow.cpp:157
-#, fuzzy
-msgid "Member Invite to Guild"
-msgstr "Spieler einladen"
+#: src/gui/socialwindow.cpp:621
+msgid "Cannot create party. You are already in a party"
+msgstr "Konnte keine Partie erstellen. Du bist schon in einer Partie."
 
-#: ../src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
-msgid "Member Invite to Party"
-msgstr "Spieler einladen"
+msgid "Party Name"
+msgstr "Party"
 
-#: ../src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Mitglied wurde erfolgreich Befördert."
+#: src/gui/socialwindow.cpp:627
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Wähle den Namen deiner Gilde"
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Nachricht"
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
+msgid "Specials"
+msgstr "Special"
 
-#: ../src/commandhandler.cpp:480
-msgid "Message closes chat."
-msgstr "Nachricht schließt Chatzeile."
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr "Spezial Sets %d"
 
-#: ../src/commandhandler.cpp:493
-msgid "Message now closes chat."
-msgstr "Jetzt schließt jede Nachricht die Chatzeile."
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr "Spezial %d"
 
-#: ../src/keyboardconfig.cpp:75
-msgid "Minimap Window"
-msgstr "Kartenfenster"
+#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#, c-format
+msgid "Level: %d"
+msgstr "Stufe: %d"
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
-msgid "Minimap: %s"
-msgstr "Ãœbersichtskarte: %s"
+msgid "Money: %s"
+msgstr "Geld: %s"
 
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Verfehlt"
+#: src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "HP:"
 
-#: ../src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "Geld: %d"
+#: src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Exp:"
+
+#: src/gui/statuswindow.cpp:130
+msgid "MP:"
+msgstr "MP:"
 
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
-msgid "Money: %s"
-msgstr "Geld: %s"
+msgid "Job: %d"
+msgstr "Beruf: %d"
 
-#: ../src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr "Monster trifft Spieler"
+#: src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Beruf:"
 
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Monster"
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Spielfigurattribute OK"
 
-#: ../src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Laufe Runter"
+#: src/gui/statuswindow.cpp:255
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "Fähigkeitspunkte: %d"
 
-#: ../src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Laufe nach Links"
+#: src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Handel vorschlagen"
 
-#: ../src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Laufe nach Rechts"
+#: src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Bestätigt. Warten..."
 
-#: ../src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Laufe Hoch"
+#: src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Handel zustimmen"
 
-#: ../src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Lautstärke der Musik"
+#: src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Zugestimmt. Warten..."
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
-#, c-format
-msgid "Music: %s"
-msgstr "Musik: %s"
+#: src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Handel: Du"
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Handeln"
 
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPCs"
+#: src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Hinzufügen"
 
-#: ../src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Name"
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "Du erhältst %s."
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Name :"
+#: src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Du gibst:"
+
+#: src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Ändern"
+
+#: src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
+"Gegenstände hinzufügen."
+
+#: src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "Du hast nicht genügend Geld."
 
-#: ../src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:51
 #, c-format
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: ../src/gui/ministatus.cpp:157
-msgid "Need"
-msgstr "Muss"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Aktualisiere..."
 
-#: ../src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Gib einen Spieler an, der aus dem Kanal geworfen werden soll"
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Verbinde..."
 
-#: ../src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
-msgstr "Gib einen Spieler an, der Moderator werden soll!"
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Los!"
 
-#: ../src/game.cpp:372
-msgid "Network Error"
-msgstr "Netzwerkfehler"
+#: src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
-#: ../src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutral"
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1 Es wird dringend empfohlen,"
 
-#: ../src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr "Neue E-Mailadresse ist fehlerhaft"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:421
+#, fuzzy
+msgid "##1  you try again later."
+msgstr "##1 es später erneut zu versuchen."
 
-#: ../src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr "Neues Passwort fehlerhaft"
+#: src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Fertig"
 
-#: ../src/net/tmwa/loginhandler.cpp:92
-msgid "New password too short."
-msgstr "Das neue Passwort ist zu kurz"
+#: src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Zeigt eine Liste der Spieler im aktuellen Kanal"
 
-#: ../src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Weiter"
+#: src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Setze das Thema des aktuellen Kanals"
 
-#: ../src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Nächster Tab"
+#: src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Verlasse einen Kanal"
 
-#: ../src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Nein"
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Ernenne einen Spieler zum Kanalmoderator"
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
-msgstr ""
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Werfe einen Spieler aus dem Kanal"
 
-#: ../src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
-msgstr "Kein freier Slot."
+#: src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Befehl: /users"
 
-#: ../src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Kein Server verfügbar"
+#: src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Dieser Befehl zeigt eine Liste der Spieler im aktuellen Kanal."
 
-#: ../src/net/tmwa/generalhandler.cpp:132
-msgid "No servers available."
-msgstr "Keine Server verfügbar"
+#: src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Befehl: /topic <Thema>"
 
-#: ../src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Kein Text"
+#: src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Dieser Befehl setzt das Theme auf <Thema>."
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
-"besserem Ort gegangen."
+#: src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Befehl: /quit"
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
-#, fuzzy
-msgid "None"
-msgstr "Nein"
+#: src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Mit diesem Befehl verlässt Du den aktuellen Kanal"
 
-#: ../src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Es läuft keine Aufzeichnung."
+#: src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Wenn Du die letzte Person im Kanal bist, wird dieser gelöscht."
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
-msgid "Not logged in."
-msgstr "nicht angemeldet"
+#: src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Befehl: /op <Name>"
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Du hast nichts zu verkaufen."
+#: src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Dieser Befehl macht Spieler <Name> zu einem Moderator des Kanals"
 
-#: ../src/gui/setup_audio.cpp:94
-#, fuzzy
-msgid "Notice"
-msgstr "Kein Text"
+#: src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
+msgstr ""
+"Moderatoren können andere Spieler aus dem Kanal werfen oder ihnen ebenfalls "
+"Moderatorrechte verleihen."
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
-msgid "OK"
-msgstr "Ok"
+#: src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Befehl: /kick <Name>"
 
-#: ../src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr "Alte E-Mailadresse ist fehlerhaft"
+#: src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Diese Befehl wirft Spieler <Name> aus dem Kanal"
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
-msgid "Old password incorrect."
-msgstr "Altes Passwort fehlerhaft"
+#: src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr "Gib einen Spieler an, der Moderator werden soll!"
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr "Ein Statuspunkt ist Null."
+#: src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Gib einen Spieler an, der aus dem Kanal geworfen werden soll"
 
-#: ../src/net/tmwa/gamehandler.cpp:87
+#: src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Globale Ansage:"
+
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
-msgid "Online users: %d"
-msgstr "Benutzer online: %d"
+msgid "Global announcement from %s:"
+msgstr "Globale Ansage von %s:"
 
-#: ../src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/gui/widgets/chattab.cpp:153
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "%s flüstert: "
 
-#: ../src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
+#: src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Kann keine leere Nachricht senden!"
 
-#: ../src/main.cpp:43
-msgid "Options:"
-msgstr "Optionen:"
+#: src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
+msgstr "/ignore > Anderen Spieler ignorieren"
 
-#: ../src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Spieler trifft Monster"
+#: src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
+msgstr "/unignore > Anderen Spieler nicht mehr ignorieren"
 
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Namen anderer Spieler"
+#: src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Schließe einen privaten Tab"
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
-msgstr "Ausrüstung: %d"
+#: src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Befehl: /close"
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr "Ausrüstung"
+#: src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Dieser Befehl schließt den aktuellen privaten Tab."
 
-#: ../src/keyboardconfig.cpp:82
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
-msgid "Outfits Window"
-msgstr "Statusfenster"
-
-#: ../src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr "Chat über Spielern"
+msgid "Command: /ignore"
+msgstr "Befehl: /item"
 
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Eigener Name"
+#: src/gui/widgets/whispertab.cpp:90
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: ../src/gui/setup_video.cpp:615
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Partikeleffekteinstellungen geändert."
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
+"<Dateiname>."
 
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Partikeleffekte"
+#: src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Status"
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
-#, c-format
-msgid "Particle count: %d"
-msgstr "Partikelzählung: %d"
+#: src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Tastenkürzel"
 
-#: ../src/gui/setup_video.cpp:263
+#: src/gui/worldselectdialog.cpp:71
 #, fuzzy
-msgid "Particle detail"
-msgstr "Partikeldetail"
+msgid "Select World"
+msgstr "OK auswählen"
 
-#: ../src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
-msgstr "Partikeldetails: %s"
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Ändern"
 
-#: ../src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Partikeleffekte"
+#: src/gui/worldselectdialog.cpp:77
+#, fuzzy
+msgid "Choose World"
+msgstr "Wähle deinen Server"
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Party"
+#: src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Laufe Hoch"
 
-#: ../src/gui/socialwindow.cpp:222
-#, c-format
-msgid "Party %s quit requested."
-msgstr "Partie %s Auflösung beauftragt."
+#: src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Laufe Runter"
 
-#: ../src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Party"
+#: src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Laufe nach Links"
 
-#: ../src/gui/socialwindow.cpp:629
-#, fuzzy
-msgid "Party Name"
-msgstr "Party"
+#: src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Laufe nach Rechts"
 
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Name der Party fehlt."
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Angriff"
 
-#: ../src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Party erfolgreich erstellt."
+#: src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Zielen & Angreifen"
 
-#: ../src/gui/beingpopup.cpp:76
-#, fuzzy, c-format
-msgid "Party: %s"
-msgstr "Party (%s)"
+#: src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Grinsen"
 
-#: ../src/client.cpp:885
-msgid "Password Change"
-msgstr "Passwort ändern:"
+#: src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Sprechen"
 
-#: ../src/client.cpp:886
-msgid "Password changed successfully!"
-msgstr "Passwort erfolgreich geändert!"
+#: src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Angriff abbrechen"
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Passwort:"
+#: src/keyboardconfig.cpp:48
+#, fuzzy
+msgid "Target Monster"
+msgstr "Nächstes Ziel anvisieren"
 
-#: ../src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Passwörter stimmen nicht überein."
+#: src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "NPC anvisieren"
 
-#: ../src/gui/popupmenu.cpp:188
-#, c-format
-msgid "Pick up %s"
-msgstr "Hebe %s auf"
+#: src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Spieler anvisieren"
 
-#: ../src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Aufheben"
 
-#: ../src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "aufgehobene Gegenstände"
+#: src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Fenster ausblenden"
 
-#: ../src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Los!"
+#: src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Sitzen"
 
-#: ../src/commandhandler.cpp:545
-msgid "Player already ignored!"
-msgstr "Spieler wird bereits ignoriert!"
+#: src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Bildschirmfoto"
 
-#: ../src/commandhandler.cpp:554
-#, fuzzy
-msgid "Player could not be ignored!"
-msgstr ""
-"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
+#: src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Handeln erlauben/verbieten"
 
-#: ../src/commandhandler.cpp:576
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr ""
-"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
+#: src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "Finde Weg zum Mauszeiger"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-msgid "Player deleted."
-msgstr "Spieler gelöscht"
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Kurztaste %d"
 
-#: ../src/commandhandler.cpp:574
-msgid "Player no longer ignored!"
-msgstr "Spieler wird nicht länger ignoriert!"
+#: src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Hilfefenster"
 
-#: ../src/commandhandler.cpp:552
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "Party erfolgreich erstellt."
+#: src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Statusfenster"
 
-#: ../src/commandhandler.cpp:569
-msgid "Player wasn't ignored!"
-msgstr "Spieler wurde nicht ignoriert!"
+#: src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Inventarfenster"
 
-#: ../src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Spieler"
+#: src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Ausrüstungsfenster"
 
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr "Spieler im Kanal:"
+#: src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Fertigkeitenfenster"
 
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Bitte verteile %d Punkte"
+#: src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Kartenfenster"
 
-#: ../src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Bitte entferne %d Punkte"
+#: src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Chatfenster"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
-msgid "Please specify a name."
-msgstr "Bitte gib einen Namen an."
+#: src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Kurztastenfenster"
 
-#: ../src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Bitte die Adresse und den Port eines Servers eingeben"
+#: src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Einstellungen"
 
-#: ../src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Das Gift hatte keine Wirkung..."
+#: src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Debugfenster"
 
-#: ../src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Port:"
+#: src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Social Window"
+msgstr "Fertigkeitenfenster"
 
-#: ../src/gui/serverdialog.cpp:452
-msgid "Preparing download"
-msgstr "Download wird vorbereitet"
+#: src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Kurztasten für Gefühle"
+
+#: src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Statusfenster"
+
+#: src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
+msgstr "Ausrüstung anziehen"
 
-#: ../src/gui/chat.cpp:307
+#: src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
+msgstr "Ausrüstung kopieren"
+
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
-msgid "Present: %s; %d players are present."
-msgstr "Anwesend: %s ;%d Spieler sind anwesend."
+msgid "Emote Shortcut %d"
+msgstr "Gefühlstaste %d"
 
-#: ../src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr "Drücke \"OK\" um neu anzufangen."
+#: src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Chat ein/aus"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Knopf drücken um die Kalibrierung zu starten"
+#: src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Im Chat hochscrollen"
 
-#: ../src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Im Chat runter scrollen"
+
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Voriger Tab"
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Preis: %s / Gesamt: %s"
+#: src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Nächster Tab"
 
-#: ../src/playerrelations.cpp:326
-msgid "Print '...'"
-msgstr "Drucke '..'"
+#: src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "OK auswählen"
 
-#: ../src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Handel vorschlagen"
+#: src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Ignoriere Eingabe 1"
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Pulsierend"
+#: src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Ignoriere Eingabe 2"
 
-#: ../src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr "Alle privaten Nachrichten in Tabs öffnen"
+#: src/keyboardconfig.cpp:183
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Beenden"
+#: src/localplayer.cpp:985
+msgid "Unable to pick up item."
+msgstr "Kann Gegenstand nicht aufheben."
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Regenbogen"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:994
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Du hast %s [@@%d|%s@@] aufgehoben."
+msgstr[1] "Du hast %s [@@%d|%s@@] aufgehoben."
 
-#: ../src/gui/socialwindow.cpp:556
-#, fuzzy
-msgid "Received guild request, but one already exists."
-msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
+#: src/localplayer.cpp:1435
+msgid "Away"
+msgstr "Abwesend"
 
-#: ../src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
+#: src/main.cpp:42
+msgid "mana [options] [mana-file]"
+msgstr "mana [Optionen] [mana-Datei]"
 
-#: ../src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Aufzeichnung läuft..."
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:108
-msgid "Red:"
-msgstr "Rot: "
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
-msgid "Register"
-msgstr "Registrieren"
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: ../src/gui/login.cpp:129
+#: src/main.cpp:47
+msgid "Options:"
+msgstr "Optionen:"
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Die Version des Spieles anzeigen"
+
+#: src/main.cpp:49
+msgid "  -h --help           : Display this help"
+msgstr "  - --help           : Zeigt diesen Hilfstext an"
+
+#: src/main.cpp:50
 #, fuzzy
-msgid "Registration disabled"
-msgstr "Teilen von Gegenständen deaktiviert."
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file     : zu benutzende Konfigurationsdatei"
 
-#: ../src/net/tmwa/loginhandler.cpp:165
-msgid "Rejected from server."
-msgstr "Vom Server zurückgewiesen"
+#: src/main.cpp:51
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Mit angegebenem Benutzernamen anmelden"
 
-#: ../src/gui/socialwindow.cpp:472
-#, fuzzy, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Partyeinladung von %s abgelehnt."
+#: src/main.cpp:52
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Angegebenes Passwort benutzen"
 
-#: ../src/gui/socialwindow.cpp:453
-#, fuzzy, c-format
-msgid "Rejected party invite from %s."
-msgstr "Partyeinladung von %s abgelehnt."
+#: src/main.cpp:53
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --charakter      : Mit angegebenem Spieler anmelden"
 
-#: ../src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Beziehung"
+#: src/main.cpp:54
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Name oder IP-Adresse des Loginservers"
 
-#: ../src/gui/login.cpp:60
-msgid "Remember username"
-msgstr "Benutzername merken"
+#: src/main.cpp:55
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Port des Loginservers"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Erbitte einen Handel"
+#: src/main.cpp:56
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host    : Benutze angegebenen Updateserver"
+
+#: src/main.cpp:57
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Wähle zuletzt benutzten Server und Spieler aus"
+
+#: src/main.cpp:59
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Ãœberspringe das Herunterladen von Updates"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/main.cpp:60
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+"  -d --data           : Datenverzeichnis, aus dem das Spiel geladen werden "
+"soll"
+
+#: src/main.cpp:61
 #, fuzzy
-msgid "Request to quit denied!"
-msgstr "Erbitte einen Handel"
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
 
-#: ../src/client.cpp:774
+#: src/main.cpp:62
 #, fuzzy
-msgid "Requesting characters"
-msgstr "Spielfigur auswählen"
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file     : zu benutzende Konfigurationsdatei"
 
-#: ../src/client.cpp:858
-msgid "Requesting registration details"
-msgstr "Fordere Registrierungsdetails an"
+#: src/main.cpp:63
+#, fuzzy
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
 
-#: ../src/commandhandler.cpp:436
-#, c-format
-msgid "Requesting to join channel %s."
-msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
+#: src/main.cpp:65
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl      : OpenGL-Erweiterungen deaktivieren"
 
-#: ../src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Zurücksetzten"
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Ach ja: Du bist Tot."
 
-#: ../src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Fenster zurücksetzen"
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid."
 
-#: ../src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Du bist nicht länger lebendig."
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Die kalten Hände des Sensenmanns greifen nach Deiner Seele."
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Abholen"
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Game Over!"
 
-#: ../src/commandhandler.cpp:489
-msgid "Return now toggles chat."
-msgstr "Jetzt schließt Enter die Chatzeile."
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
+"besserem Ort gegangen."
 
-#: ../src/commandhandler.cpp:480
-msgid "Return toggles chat."
-msgstr "Enter-Taste schließt Chatzeile."
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
+"nicht ganz so genial, wie Du dachtest..."
 
-#: ../src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Kreise den Steuerknüppel"
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Ich glaube, das war nicht so gut."
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
 
-#: ../src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Vernichtet."
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Auflösung geändert"
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
 
-#: ../src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Bildschirmfoto"
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir "
+"einen paar Neue."
 
-#: ../src/game.cpp:333
-#, fuzzy
-msgid "Screenshot saved as "
-msgstr "Bildschirmfoto wurde nach ~/ gespeichert."
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr "Drücke \"OK\" um neu anzufangen."
 
-#: ../src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Im Chat runter scrollen"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr "Du bist tot."
 
-#: ../src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Im Chat hochscrollen"
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr "nicht angemeldet"
 
-#: ../src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Es scheint, als bräuchtest Du mehr Geld... ;-)"
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr "Kein freier Slot."
 
-#: ../src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "OK auswählen"
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr "Ungültiger Name."
 
-#: ../src/gui/worldselectdialog.cpp:71
-#, fuzzy
-msgid "Select World"
-msgstr "OK auswählen"
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr "Benutzername bereits vorhanden"
 
-#: ../src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr "Ungültiger Haarstil."
 
-#: ../src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
-msgstr "Wähle aus, wie viele Gegenstände du wieder haben möchtest."
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr "Ungültige Haarfarbe."
 
-#: ../src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Wähle aus, wie viel Gegenstände Du aufteilen möchtest."
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr "Ungültiges Geschlecht."
 
-#: ../src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Wähle aus, wie viele Gegenstände du einlagern möchtest."
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr "Spielfigurattribute sind zu groß."
 
-#: ../src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr "Spielfigurattribute sind zu klein"
 
-#: ../src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+msgid "Unknown error."
+msgstr "Unbekannter Fehler"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr "Spieler gelöscht"
+
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Verkaufen"
-
-#: ../src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Senden"
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Unbekannter Fehler"
 
-#: ../src/gui/serverdialog.cpp:211
-#, fuzzy
-msgid "Server type:"
-msgstr "Server:"
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Kein Server verfügbar"
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Server:"
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Thema: %s"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Einstellungen"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr "Spieler im Kanal:"
 
-#: ../src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Einstellungen"
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr "Fehler beim Betreten des Kanals."
 
-#: ../src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Lautstärke der Klangeffekte"
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr "Liste Kanäle"
 
-#: ../src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Geschäft"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr "Ende der Channel-Liste."
 
-#: ../src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Tastenkürzel"
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr "%s ist dem Kanal beigetreten."
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
-msgid "Show IP: Off"
-msgstr "IP Anzeige: Aus"
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr "%s hat den Channel verlassen."
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
-msgid "Show IP: On"
-msgstr "IP Anzeige: An"
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr "%s hat den Modus %s auf den Spieler %s gesetzt."
 
-#: ../src/gui/setup_video.cpp:254
-#, fuzzy
-msgid "Show damage"
-msgstr "Eigener Name"
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr "%s hat %s gekickt."
 
-#: ../src/gui/setup_players.cpp:232
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
-msgid "Show gender"
-msgstr "Geschlecht"
+msgid "Unknown channel event."
+msgstr "Unbekannter Befehl."
 
-#: ../src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show own name"
-msgstr "Eigener Name"
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Gilde erstellt."
 
-#: ../src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
-msgstr "Benachrichtigung beim Aufheben"
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Fehler beim Erstellen der Gilde."
 
-#: ../src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "Sitzen"
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Einladung gesendet."
 
-#: ../src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Sitzen fehlgeschlagen!"
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Mitglied wurde erfolgreich befördert."
 
-#: ../src/gui/skilldialog.cpp:362
-#, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Fertigkeiten"
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Beförderung des Mitglieds gescheitert."
 
-#: ../src/gui/skilldialog.cpp:353
-#, fuzzy, c-format
-msgid "Skill Set %d"
-msgstr "Fähigkeitspunkte: %d"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr "Fehlerhaftes Magiemerkmal"
 
-#: ../src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Fertigkeitenfenster"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr "Bereits angemeldet"
 
-#: ../src/gui/skilldialog.cpp:271
-#, fuzzy, c-format
-msgid "Skill points available: %d"
-msgstr "Fähigkeitspunkte: %d"
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Account abgelaufen"
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Fertigkeiten"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr "Neues Passwort fehlerhaft"
 
-#: ../src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr "Plätze:"
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr "Altes Passwort fehlerhaft"
 
-#: ../src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Klein"
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
 
-#: ../src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Grinsen"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr "Neue E-Mailadresse ist fehlerhaft"
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
-#, fuzzy
-msgid "Social"
-msgstr "Special"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr "Alte E-Mailadresse ist fehlerhaft"
 
-#: ../src/keyboardconfig.cpp:80
-#, fuzzy
-msgid "Social Window"
-msgstr "Fertigkeitenfenster"
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr "Die neue E-Mailadresse ist bereits vorhanden."
 
-#: ../src/gui/setup_video.cpp:582
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
-"Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
-"anzupassen."
+"Client Registrierung wurde deaktiviert. Bitte den Serveradministrator "
+"kontaktieren."
 
-#: ../src/net/tmwa/generalhandler.cpp:136
-msgid "Someone else is trying to use this account."
-msgstr "Jemand anderes versucht diesen Account zu benutzen"
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr "Die Version des Spiels ist zu alt"
 
-#: ../src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Ton"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr "Benutzername oder Passwort falsch"
 
-#: ../src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr "Soundengine"
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Account abgelaufen"
 
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr "Spezial %d"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr "Anmeldeversuch zu früh nach vorherigem Versuch."
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr "Special"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr "Benutzername, Passwort oder E-Mailadresse falsch"
 
-#: ../src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr "Spezial Sets %d"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr "Benutzername bereits vorhanden"
 
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Spektrum"
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr "E-Mailadresse bereits vorhanden"
 
-#: ../src/net/tmwa/generalhandler.cpp:142
-msgid "Speed hack detected."
-msgstr "Geschwindigkeitsproblem festgestellt"
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+"Du hast für das Captcha zu lange gebraucht oder deine Eingabe war inkorrekt."
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
-msgid "Split"
-msgstr "Aufteilen"
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Der Party beigetreten."
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
-msgstr ""
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s ist der Party beigetreten."
 
-#: ../src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Starte Aufzeichnung..."
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr "%s hat Deine Einladung zurückgewiesen."
 
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Statisch"
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Akzeptiere eingehende Handelsanfragen."
 
-#: ../src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Status"
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignoriere eingehende Handelsanfragen."
 
-#: ../src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Statusfenster"
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Erbitte einen Handel"
 
-#: ../src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Stopp"
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s möchte mit dir handeln, stimmst Du zu?"
 
-#: ../src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Angriff abbrechen"
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Handele mit %s"
 
-#: ../src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Stoppe Aufzeichnung"
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Handel abgebrochen."
 
-#: ../src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Lager"
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Handel abgeschlossen."
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
-msgid "Store"
-msgstr "Einlagern"
+#: src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Stärke"
+#: src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Spieler aus dem Kanal geworfen!"
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Stärke %+d"
+#: src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Du hast nichts zu verkaufen."
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Stärke:"
+#: src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Vielen Dank für den Einkauf."
 
-#: ../src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Absenden"
+#: src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Kauf fehlgeschlagen."
 
-#: ../src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr "Login wechseln"
+#: src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Vielen Dank für den Verkauf."
 
-#: ../src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Spielfigur wechseln"
+#: src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Verkauf fehlgeschlagen."
 
-#: ../src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Server wechseln"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Zugriff verweigert. Wahrscheinlich zu viele Spieler auf dem Server."
 
-#: ../src/gui/setup_video.cpp:445
+#: src/net/tmwa/charserverhandler.cpp:107
+msgid "Cannot use this ID."
+msgstr "Kann diese ID nicht benutzen"
+
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Switching to Full Screen"
-msgstr "Wechsle zum Vollbildmodus"
+msgid "Unknown char-server failure."
+msgstr "Unbekannter Fehler"
 
-#: ../src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Sprechen"
+#: src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+"Charakter konnte nicht erstellt werden. Wahrscheinlich ist der Name bereits "
+"vergeben."
 
-#: ../src/gui/popupmenu.cpp:150
-#, c-format
-msgid "Talk to %s"
-msgstr "Rede mit %s"
+#: src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Spieler gelöscht."
 
-#: ../src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Zielen & Angreifen"
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Spieler konnte nicht gelöscht werden."
 
-#: ../src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "Target Monster"
-msgstr "Nächstes Ziel anvisieren"
+#: src/net/tmwa/charserverhandler.cpp:266
+msgid "Strength:"
+msgstr "Stärke:"
 
-#: ../src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "NPC anvisieren"
+#: src/net/tmwa/charserverhandler.cpp:267
+msgid "Agility:"
+msgstr "Agilität:"
 
-#: ../src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Spieler anvisieren"
+#: src/net/tmwa/charserverhandler.cpp:268
+msgid "Vitality:"
+msgstr "Vitalität:"
 
-#: ../src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Text"
+#: src/net/tmwa/charserverhandler.cpp:269
+msgid "Intelligence:"
+msgstr "Intelligenz:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Vielen Dank für den Einkauf."
+#: src/net/tmwa/charserverhandler.cpp:270
+msgid "Dexterity:"
+msgstr "Geschicklichkeit:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Vielen Dank für den Verkauf."
+#: src/net/tmwa/charserverhandler.cpp:271
+msgid "Luck:"
+msgstr "Glück:"
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Die kalten Hände des Sensemanns greifen nach Deiner Seele."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Nachricht konnte nicht gesendet werden, Spieler ist offline."
 
-#: ../src/game.cpp:368
-#, fuzzy
-msgid "The connection to the server was lost."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
-"Die Verbindung zum Server wurde getrennt, das Programm wird jetzt beendet"
+"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: ../src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
-msgstr "Die neuen E-Mailadresse stimmen nicht überein."
+#: src/net/tmwa/chathandler.cpp:230
+msgid "MVP player."
+msgstr "Spieler"
 
-#: ../src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr "Die neue E-Mailadresse ist bereits vorhanden."
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Kanäle werden nicht unterstützt!"
 
-#: ../src/gui/changeemaildialog.cpp:127
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "Die neue E-Mailadresse muss aus mindestens %d Zeichen bestehen."
+msgid "Online users: %d"
+msgstr "Benutzer online: %d"
 
-#: ../src/gui/changeemaildialog.cpp:134
-#, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "Die neue E-Mailadresse muss kürzer als %d Zeichen sein."
+#: src/net/tmwa/gamehandler.cpp:101
+msgid "Game"
+msgstr "Spiel"
 
-#: ../src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
-msgstr "Die neues Passwörter stimmen nicht überein."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Erbitte einen Handel"
 
-#: ../src/gui/changepassworddialog.cpp:116
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "Das neue Passwort muss aus mindestens %d Zeichen bestehen."
+msgid "Strength %+d"
+msgstr "Stärke %+d"
 
-#: ../src/gui/changepassworddialog.cpp:123
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "Das neue Passwort muss kürzer als %d Zeichen sein."
+msgid "Agility %+d"
+msgstr "Beweglichkeit %+d"
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "Das Passwort muss aus mindestens %d bestehen."
+msgid "Vitality %+d"
+msgstr "Gesundheit %+d"
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "Das Passwort muss kürzer als %d Zeichen sein."
+msgid "Intelligence %+d"
+msgstr "Intelligenz %+d"
 
-#: ../src/gui/register.cpp:166
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
+msgid "Dexterity %+d"
+msgstr "Ausdauer %+d"
 
-#: ../src/gui/register.cpp:174
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
+msgid "Luck %+d"
+msgstr "Glück %+d"
+
+#: src/net/tmwa/generalhandler.cpp:132
+msgid "Authentication failed."
+msgstr "Authentifizierung fehlgeschlagen"
 
-#: ../src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:135
+msgid "No servers available."
+msgstr "Keine Server verfügbar"
+
+#: src/net/tmwa/generalhandler.cpp:139
+msgid "Someone else is trying to use this account."
+msgstr "Jemand anderes versucht diesen Account zu benutzen"
+
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr "Dieser Account ist bereits angemeldet"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Dieser Befehl lässt Dich die Party verlassen"
+#: src/net/tmwa/generalhandler.cpp:145
+msgid "Speed hack detected."
+msgstr "Geschwindigkeitsproblem festgestellt"
 
-#: ../src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Dieser Befehl lässt Dich die Party verlassen"
+#: src/net/tmwa/generalhandler.cpp:148
+msgid "Duplicated login."
+msgstr "Mehrfache Anmeldung"
 
-#: ../src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "Dieser Befehl ändert das Teilen der Erfahrungspunkte in einer Party."
+#: src/net/tmwa/generalhandler.cpp:151
+msgid "Unknown connection error."
+msgstr "Unbekannter Verbindungsfehler"
 
-#: ../src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr ""
-"Dieser Befehl ändert die Einstellungen zum Teilen von Gegenständen in einer "
-"Party."
+#: src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Verbindung zum Server unterbrochen!"
 
-#: ../src/commandhandler.cpp:275
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Dieser Befehl setzt das Theme auf <Thema>."
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Stärke"
 
-#: ../src/commandhandler.cpp:229
-msgid "This command clears the chat log of previous chat."
-msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Beweglichkeit"
 
-#: ../src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "Dieser Befehl schließt den aktuellen privaten Tab."
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Gesundheit"
 
-#: ../src/commandhandler.cpp:280
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Intelligenz"
 
-#: ../src/commandhandler.cpp:210
-msgid "This command displays a list of all commands available."
-msgstr "Dieser Befehl zeigt alle möglichen Befehle an"
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Ausdauer"
 
-#: ../src/commandhandler.cpp:213
-msgid "This command displays help on <command>."
-msgstr "Dieser Befehl zeigt die Hilfe für <Befehl>."
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Glück"
 
-#: ../src/commandhandler.cpp:324
-msgid "This command displays the name of the current map."
-msgstr "Dieser Befehl zeigt den Namen der aktuellen Karte an."
+#: src/net/tmwa/generalhandler.cpp:238
+msgid "Defense"
+msgstr "Verteidigung:"
 
-#: ../src/commandhandler.cpp:329
-msgid "This command displays the number of players currently online."
-msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
+#: src/net/tmwa/generalhandler.cpp:239
+msgid "M.Attack"
+msgstr "M.Angriff:"
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr ""
-"Dieser Befehl zeigt an, ob das Teilen von Erfahrungspunkten in der Party "
-"aktiviert ist."
+#: src/net/tmwa/generalhandler.cpp:240
+msgid "M.Defense"
+msgstr "M.Verteidigung:"
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr ""
-"Dieser Befehl zeigt an, ob Gegenstände in der Party geteilt werden, oder "
-"nicht."
+#: src/net/tmwa/generalhandler.cpp:241
+#, c-format
+msgid "% Accuracy"
+msgstr "% Accuracy"
 
-#: ../src/commandhandler.cpp:313
-msgid "This command displays the return toggle status."
-msgstr "Dieser Befehl zeigt, wann sich die Chatzeile schließt."
+#: src/net/tmwa/generalhandler.cpp:242
+#, c-format
+msgid "% Evade"
+msgstr "% Evade"
 
-#: ../src/commandhandler.cpp:302
-msgid "This command finishes a recording session."
-msgstr "Dieser Befehl beendet den Mitschnitt des Chats."
+#: src/net/tmwa/generalhandler.cpp:243
+#, c-format
+msgid "% Critical"
+msgstr "% Critical"
 
-#: ../src/commandhandler.cpp:292
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"Dieser Befehl erstellt eine Liste mit allen Spielern in Hörreichweite und "
-"sendet sie entweder an das Chatlog, falls aktiviert, oder zeigt sie im "
-"Chatfenster an."
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gilde"
 
-#: ../src/commandhandler.cpp:234
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Diese Hilfe anzeigen"
 
-#: ../src/gui/widgets/whispertab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
+#: src/net/tmwa/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Werfe jemanden aus Deiner Party"
 
-#: ../src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Mit diesem Befehl verlässt Du den aktuellen Kanal"
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Befehl: /invite <Name>"
 
-#: ../src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Dieser Befehl macht Spieler <Name> zu einem Moderator des Kanals"
+#: src/net/tmwa/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
 
-#: ../src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Diese Befehl wirft Spieler <Name> aus dem Kanal"
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Befehl: /leave"
 
-#: ../src/commandhandler.cpp:240
-msgid "This command makes you enter <channel>."
-msgstr "Dieser Befehl lässt dich dem Kanal <Kanal> beitreten."
+#: src/net/tmwa/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Dieser Befehl lässt Dich die Party verlassen"
 
-#: ../src/commandhandler.cpp:223
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Dieser Befehl versendet die Nachricht <Nachricht> an alle Spieler die gerade "
-"online sind."
+#: src/net/tmwa/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Name der Party fehlt."
 
-#: ../src/commandhandler.cpp:258
-msgid "This command sends the text <message> to <nick>."
-msgstr "Dieser Befehl sendet den Text <Nachricht> an den Spieler <Name>."
+#: src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
+msgstr "Konnte User nicht in Gilde einladen."
 
-#: ../src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Dieser Befehl setzt das Theme auf <Thema>."
+#: src/net/tmwa/guildhandler.cpp:301
+#, fuzzy
+msgid "User rejected guild invite."
+msgstr "%s hat Deine Einladung zurückgewiesen."
 
-#: ../src/commandhandler.cpp:307
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Mit diesem Befehl kannst Du entscheiden, ob die Chatzeile schließt, sobald "
-"eine Nachricht gesendet wurde, oder erst nachdem die Enter-Taste erneut "
-"gedrückt wurde."
+#: src/net/tmwa/guildhandler.cpp:306
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s ist nun Mitglied Deiner Party."
 
-#: ../src/commandhandler.cpp:246
-msgid "This command shows a list of all channels."
-msgstr "Dieser Befehl zeigt eine liste aller Kanäle an."
+#: src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
+msgstr "Deine Gilde ist voll."
 
-#: ../src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Dieser Befehl zeit eine Liste der Spieler im aktuellen Kanal."
+#: src/net/tmwa/guildhandler.cpp:316
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Unbekannte Reaktion auf die Einladung von %s."
 
-#: ../src/commandhandler.cpp:299
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr ""
-"Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
-"<Dateiname>."
+#: src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
+msgstr "Gildenerstellung wird nocht nicht unterstützt."
 
-#: ../src/commandhandler.cpp:318
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-"Dieser Befehl hebt die Ignorierung des angegeben ignorierten Spieler auf."
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Party"
 
-#: ../src/gui/widgets/whispertab.cpp:95
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
-"<Dateiname>."
+#: src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
 
-#: ../src/commandhandler.cpp:251
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Dieser Befehl zeigt eine Aktion <Nachricht> an."
+#: src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
 
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr "Dieser Befehl teilt deine Abwesenheit und deren angegebenen Grund mit."
+#: src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Werfe jemanden aus Deiner Party"
 
-#: ../src/commandhandler.cpp:266
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
 msgstr ""
-"Dieser Befehl erstellt einen neuen Tab für private Nachrichten zwischen Dir "
-"und Spieler <Name>."
-
-#: ../src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "So wird die Farbe aussehen"
+"/item > Zeige oder ändere die Optionen zum Teilen der Gegenstände in der "
+"Party"
 
-#: ../src/net/tmwa/loginhandler.cpp:179
-msgid "This user name is already taken."
-msgstr "Dieser Spielername ist bereits vergeben"
+#: src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+"/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in der "
+"Party"
 
-#: ../src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Winzig"
+#: src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Dieser Befehl lässt Dich die Party verlassen"
 
-#: ../src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "Nach:"
+#: src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Befehl: /item <Wert>"
 
-#: ../src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr "Chat ein/aus"
+#: src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+"Dieser Befehl ändert die Einstellungen zum Teilen von Gegenständen in einer "
+"Party."
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Thema: %s"
+#: src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<Wert> darf enthalten: \"1\",\"yes\" oder \"true\" um das Teilen von "
+"Gegenständen zu erlauben, \"0\",\"no\" oder \"false\" um es zu verbieten."
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Handeln"
+#: src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Befehl: /item"
 
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Handel abgebrochen."
+#: src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+"Dieser Befehl zeigt an, ob Gegenstände in der Party geteilt werden, oder "
+"nicht."
 
-#: ../src/net/tmwa/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Handel aus unbekanntem Grund abgebrochen"
+#: src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Befehl: /exp <Wert>"
 
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Handel abgeschlossen."
+#: src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr "Dieser Befehl ändert das Teilen der Erfahrungspunkte in einer Party."
 
-#: ../src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Handel fehlgeschlagen!"
+#: src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"Gültige Werte für <Wert> sind: \"1\",\"yes\",\"true\" um das Teilen zu "
+"erlauben, \"0\",\"no\",\"false\" verbieten es."
 
-#: ../src/net/tmwa/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Handel mit %s abgebrochen."
+#: src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Befehl: /exp"
 
-#: ../src/gui/popupmenu.cpp:83
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "Handele mit %s"
+#: src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+"Dieser Befehl zeigt an, ob das Teilen von Erfahrungspunkten in der Party "
+"aktiviert ist."
 
-#: ../src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Handel: Du"
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Teilen von Gegenständen aktiviert."
 
-#: ../src/net/tmwa/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Handel: Du und %s"
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Teilen von Gegenständen deaktiviert."
 
-#: ../src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Handel nicht möglich. Spieler existiert nicht."
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "Teilen von Gegenständen nicht möglich."
 
-#: ../src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Handel nicht möglich. Handelspartner ist zu weit weg."
+#: src/net/tmwa/gui/partytab.cpp:141
+#, fuzzy
+msgid "Item sharing unknown."
+msgstr "Teilen von Gegenständen aktiviert."
 
-#: ../src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Handele mit %s"
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Teilen der Erfahrungspunkte aktiviert."
 
-#: ../src/gui/setup_video.cpp:477
-#, fuzzy
-msgid "Transparency disabled"
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
 msgstr "Teilen der Erfahrungspunkte deaktiviert."
 
-#: ../src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
-msgstr "Transparenz aktiviert."
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "Teilen der Erfahrungspunkte nicht möglich."
 
-#: ../src/localplayer.cpp:1251
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
-msgid "Tried to pick up nonexistent item."
-msgstr "Kann das nicht aufheben."
-
-#: ../src/commandhandler.cpp:335
-msgid "Type /help for a list of commands."
-msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
-
-#: ../src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
-msgstr "Gib die neue E-Mailadresse zweimal ein:"
-
-#: ../src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
-msgstr "Gib dein neues Passwort zweimal ein:"
-
-#: ../src/gui/setup_colors.cpp:71
-msgid "Type:"
-msgstr "Typ: "
+msgid "Experience sharing unknown."
+msgstr "Teilen der Erfahrungspunkte aktiviert."
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Kauf fehlgeschlagen."
+#: src/net/tmwa/inventoryhandler.cpp:285
+msgid "Failed to use item."
+msgstr "Gegenstand konnte nicht benutzt werden."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
-msgstr "Kann Gegenstand nicht Ausrüsten."
+msgstr "Kann Gegenstand nicht ausrüsten."
 
-#: ../src/net/tmwa/network.cpp:345
-msgid "Unable to resolve host \""
-msgstr "Nicht möglich den host \" aufzulösen"
-
-#: ../src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Verkauf fehlgeschlagen."
-
-#: ../src/net/tmwa/inventoryhandler.cpp:418
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Kann Gegenstand nicht ablegen."
 
-#: ../src/gui/setup_keyboard.cpp:90
-#, fuzzy
-msgid "Unassign"
-msgstr "Zuordnen"
+#: src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Account konnte nicht gefunden werden. Bitte melde dich erneut an."
 
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
-msgid "Unequip"
-msgstr "Ablegen"
+#: src/net/tmwa/loginhandler.cpp:92
+msgid "New password too short."
+msgstr "Das neue Passwort ist zu kurz"
 
-#: ../src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
-msgstr "erstes ausziehen"
+#: src/net/tmwa/loginhandler.cpp:156
+msgid "Unregistered ID."
+msgstr "Unbekannte ID"
 
-#: ../src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "Ãœbergangenes Handelsabbruchspaket."
+#: src/net/tmwa/loginhandler.cpp:159
+msgid "Wrong password."
+msgstr "Falsches Passwort"
+
+#: src/net/tmwa/loginhandler.cpp:162
+msgid "Account expired."
+msgstr "Account abgelaufen"
+
+#: src/net/tmwa/loginhandler.cpp:165
+msgid "Rejected from server."
+msgstr "Vom Server zurückgewiesen"
+
+#: src/net/tmwa/loginhandler.cpp:168
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"Du wurdest permanent vom Spiel ausgeschlossen. Bitte wende Dich an das GM-"
+"Team."
 
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
-msgid "Unignore %s"
-msgstr "Ignoriere %s nicht mehr"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Du wurdest zeitweise, bis %s vom Spiel ausgeschlossen.\n"
+"Bitte wende dich mittels des Forums an das GM-Team."
 
-#: ../src/net/net.cpp:145
-#, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Unbekannter Gegenstand"
+#: src/net/tmwa/loginhandler.cpp:179
+msgid "This user name is already taken."
+msgstr "Dieser Spielername ist bereits vergeben"
 
-#: ../src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Unbekannter Befehl."
+#: src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr "Empty address given to Network::connect()!"
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
-#, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Unbekannter Fehler"
+#: src/net/tmwa/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr "Nicht möglich den host \" aufzulösen"
 
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
-msgid "Unknown command."
-msgstr "Unbekannter Befehl."
+#: src/net/tmwa/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr "Verbindung mit Server abgebrochen. "
 
-#: ../src/net/tmwa/generalhandler.cpp:148
-msgid "Unknown connection error."
-msgstr "Unbekannter Verbindungsfehler"
+#: src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Konnte Party nicht erstellen."
 
-#: ../src/net/manaserv/charhandler.cpp:208
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Unbekannter Fehler"
+#: src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Party erfolgreich erstellt."
 
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
-msgid "Unknown error."
-msgstr "Unbekannter Fehler"
+#: src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s ist bereits Mitglied einer Party."
 
-#: ../src/net/tmwa/guildhandler.cpp:315
-#, fuzzy
-msgid "Unknown guild invite response."
-msgstr "Unbekannte Reaktion auf die Einladung von %s."
+#: src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s hat Deine Einladung zurückgewiesen."
+
+#: src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s ist nun Mitglied Deiner Party."
 
-#: ../src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Unbekannte Reaktion auf die Einladung von %s."
 
-#: ../src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Unbekannter Gegenstand"
+#: src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Du hast die Party verlassen."
 
-#: ../src/localplayer.cpp:1258
-#, fuzzy
-msgid "Unknown problem picking up item."
-msgstr "Kann das nicht aufheben."
+#: src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s hat Deine Party verlassen."
 
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Abmelden"
+#: src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
 
-#: ../src/client.cpp:926
-#, fuzzy
-msgid "Unregister Successful"
-msgstr "Abmelden"
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr "Einladung fehlgeschlagen, da du den Spieler %s nicht sehen kannst."
 
-#: ../src/net/tmwa/loginhandler.cpp:156
-msgid "Unregistered ID."
-msgstr "Unbekannte ID"
+#: src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
+msgstr "Du kannst nur einladen wenn du in einer Partie bist."
 
-#: ../src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Erhöhen"
+#: src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s ist nicht in Deiner Party!"
 
-#: ../src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Aktualisiere..."
+#: src/net/tmwa/playerhandler.cpp:100
+msgid "Insert coin to continue."
+msgstr "Gib eine Münze ein um weiter zuspielen."
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
-msgid "Use"
-msgstr "Benutzen"
+#: src/net/tmwa/playerhandler.cpp:118
+msgid "You're not dead yet. You're just resting."
+msgstr "Du bist nicht tot. Du erholst Dich bloß."
 
-#: ../src/net/tmwa/guildhandler.cpp:305
-#, fuzzy
-msgid "User is now part of your guild."
-msgstr "%s ist nun Mitglied Deiner Party."
+#: src/net/tmwa/playerhandler.cpp:119
+msgid "You are no more."
+msgstr "Du bist nicht mehr."
 
-#: ../src/net/tmwa/guildhandler.cpp:300
-#, fuzzy
-msgid "User rejected guild invite."
-msgstr "%s hat Deine Einladung zurückgewiesen."
+#: src/net/tmwa/playerhandler.cpp:120
+msgid "You have ceased to be."
+msgstr "Du hast Dich entschieden, dem Irdischen zu entsagen."
 
-#: ../src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr "Benutzername bereits vorhanden"
+#: src/net/tmwa/playerhandler.cpp:121
+msgid "You've expired and gone to meet your maker."
+msgstr "Deine Zeit ist abgelaufen. Zeit, deinem Schöpfer gegenüberzutreten."
 
-#: ../src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Video"
+#: src/net/tmwa/playerhandler.cpp:122
+msgid "You're a stiff."
+msgstr "Du bist ein wenig steif."
 
-#: ../src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Sichtbare Namen"
+#: src/net/tmwa/playerhandler.cpp:123
+msgid "Bereft of life, you rest in peace."
+msgstr "Des Lebens beraubt ruhst Du in Frieden."
 
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Gesundheit"
+#: src/net/tmwa/playerhandler.cpp:124
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+"Wenn Du nicht so lebendig wärst, könntest Du die Gänseblümchen von unten "
+"sehen."
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr "Gesundheit %+d"
+#: src/net/tmwa/playerhandler.cpp:125
+msgid "Your metabolic processes are now history."
+msgstr "Deine Körperfunktionen sind nun Geschichte."
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Vitalität:"
+#: src/net/tmwa/playerhandler.cpp:126
+msgid "You're off the twig."
+msgstr "Du kriegst nichts mehr mit."
 
-#: ../src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "Warte auf den Server"
+#: src/net/tmwa/playerhandler.cpp:127
+msgid "You've kicked the bucket."
+msgstr "Jetzt passt Du in 'nen Eimer."
 
-#: ../src/gui/serverdialog.cpp:448
-msgid "Waiting for server..."
-msgstr "Warte auf den Server"
+#: src/net/tmwa/playerhandler.cpp:128
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+"Du hast Deine sterbliche Hülle abgelegt, der Schleier legt sich über Dich "
+"und Du trittst dem Chor der blutenden Unsichtbaren bei."
 
-#: ../src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "Warp fehlgeschlagen..."
+#: src/net/tmwa/playerhandler.cpp:130
+msgid "You are an ex-player."
+msgstr "Du warst einmal ein Spieler."
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid."
+#: src/net/tmwa/playerhandler.cpp:131
+msgid "You're pining for the fjords."
+msgstr "Du schmachtest nach den Fjorden."
 
-#: ../src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
-msgstr "Ausrüstung anziehen"
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
+msgid "Message"
+msgstr "Nachricht"
 
-#: ../src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Gewicht:"
+#: src/net/tmwa/playerhandler.cpp:247
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
+"heilen."
 
-#: ../src/gui/itempopup.cpp:126
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
-msgid "Weight: %s"
-msgstr "Gewicht: %s"
+msgid "You picked up %s."
+msgstr "Du hast %s aufgehoben "
 
-#: ../src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "Wenn ignorierend:"
+#: src/net/tmwa/playerhandler.cpp:348
+msgid "Cannot raise skill!"
+msgstr "Kann Skill nicht erhöhen!"
 
-#: ../src/gui/popupmenu.cpp:91
-#, c-format
-msgid "Whisper %s"
-msgstr "flüstere %s"
+#: src/net/tmwa/playerhandler.cpp:488
+msgid "Equip arrows first."
+msgstr "Rüste dich zuerst mit Pfeilen aus."
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr ""
-"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
+#: src/net/tmwa/specialhandler.cpp:144
+msgid "Trade failed!"
+msgstr "Handel fehlgeschlagen!"
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "Nachricht konnte nicht gesendet werden, Spieler ist offline."
+#: src/net/tmwa/specialhandler.cpp:147
+msgid "Emote failed!"
+msgstr "Gefühl fehlgeschlagen!"
 
-#: ../src/gui/chat.cpp:452
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Flüsternd zu %s: %s"
+#: src/net/tmwa/specialhandler.cpp:150
+msgid "Sit failed!"
+msgstr "Sitzen fehlgeschlagen!"
 
-#: ../src/gui/socialwindow.cpp:158
-#, fuzzy, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr "Wen möchtest du einladen?"
+#: src/net/tmwa/specialhandler.cpp:153
+msgid "Chat creating failed!"
+msgstr "Chat-Erstellung fehlgeschlagen!"
 
-#: ../src/gui/socialwindow.cpp:237
-#, fuzzy, c-format
-msgid "Who would you like to invite to party %s?"
-msgstr "Wen möchtest du einladen?"
+#: src/net/tmwa/specialhandler.cpp:156
+msgid "Could not join party!"
+msgstr "Kann der Gruppe nicht beitreten!"
 
-#: ../src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr "Willenskraft:"
+#: src/net/tmwa/specialhandler.cpp:159
+msgid "Cannot shout!"
+msgstr "Kann nicht rufen!"
 
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "Willensstärke %+d"
+#: src/net/tmwa/specialhandler.cpp:168
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Dein Level ist noch nicht hoch genug!"
 
-#: ../src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr "Fehlerhaftes Magiemerkmal"
+#: src/net/tmwa/specialhandler.cpp:171
+msgid "Insufficient HP!"
+msgstr "Nicht genug HP!"
 
-#: ../src/net/tmwa/loginhandler.cpp:159
-msgid "Wrong password."
-msgstr "Falsches Passwort"
+#: src/net/tmwa/specialhandler.cpp:174
+msgid "Insufficient SP!"
+msgstr "Nicht genug SP!"
 
-#: ../src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr "Benutzername oder Passwort falsch"
+#: src/net/tmwa/specialhandler.cpp:177
+msgid "You have no memos!"
+msgstr "Keine Memos vorhanden!"
 
-#: ../src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr "Benutzername, Passwort oder E-Mailadresse falsch"
+#: src/net/tmwa/specialhandler.cpp:180
+msgid "You cannot do that right now!"
+msgstr "Du kannst dies momentan nicht tun!"
 
-#: ../src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Ja"
+#: src/net/tmwa/specialhandler.cpp:183
+msgid "Seems you need more money... ;-)"
+msgstr "Es scheint, als bräuchtest Du mehr Geld... ;-)"
 
-#: ../src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr "Du bist tot."
+#: src/net/tmwa/specialhandler.cpp:186
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!"
 
-#: ../src/net/tmwa/playerhandler.cpp:139
-msgid "You are an ex-player."
-msgstr "Du warst einmal ein Spieler."
+#: src/net/tmwa/specialhandler.cpp:189
+msgid "You need another red gem!"
+msgstr "Du brauchst noch einen roten Edelstein!"
 
-#: ../src/net/tmwa/playerhandler.cpp:257
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
-"heilen."
+#: src/net/tmwa/specialhandler.cpp:192
+msgid "You need another blue gem!"
+msgstr "Du brauchst noch einen blauen Edelstein!"
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Ach ja: Du bist Tot."
+#: src/net/tmwa/specialhandler.cpp:195
+msgid "You're carrying to much to do this!"
+msgstr "Du schleppst zu viel herum, um das zu machen!"
 
-#: ../src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Du bist nicht mehr."
+#: src/net/tmwa/specialhandler.cpp:198
+msgid "Huh? What's that?"
+msgstr "Huch? Was ist das?"
 
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Du bist nicht länger lebendig."
+#: src/net/tmwa/specialhandler.cpp:207
+msgid "Warp failed..."
+msgstr "Warp fehlgeschlagen..."
 
-#: ../src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
-msgstr "Du kannst nur einladen wenn du in einer Partie bist."
+#: src/net/tmwa/specialhandler.cpp:210
+msgid "Could not steal anything..."
+msgstr "Konnte nichts stehlen..."
 
-#: ../src/net/tmwa/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "Du kannst dies momentan nicht tun!"
+#: src/net/tmwa/specialhandler.cpp:213
+msgid "Poison had no effect..."
+msgstr "Das Gift hatte keine Wirkung..."
 
-#: ../src/net/tmwa/specialhandler.cpp:189
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!"
+#: src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Handel nicht möglich. Handelspartner ist zu weit weg."
 
-#: ../src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "Du hast nicht genügend Geld."
+#: src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Handel nicht möglich. Spieler existiert nicht."
 
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
-#, fuzzy, c-format
-msgid "You get %s"
-msgstr "Du erhältst %s."
+#: src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Handel aus unbekanntem Grund abgebrochen"
 
-#: ../src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "Du gibst:"
+#: src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Handel: Du und %s"
 
-#: ../src/gui/socialwindow.cpp:592
-#, fuzzy, c-format
-msgid "You have been invited to join the %s party."
-msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
+#: src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel mit %s abgebrochen."
 
-#: ../src/gui/socialwindow.cpp:588
-#, fuzzy
-msgid "You have been invited you to join a party."
-msgstr "%s hat dich in seine Party eingeladen."
+#: src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr "Ãœbergangenes Handelsabbruchspaket."
 
-#: ../src/net/tmwa/loginhandler.cpp:168
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
+#: src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
-"Du wurdest permanent vom Spiel ausgeschlossen. Bitte wende Dich an das GM "
-"Team."
+"Gegenstand konnte nicht hinzugefügt werden. Handelspartner ist überladen."
 
-#: ../src/net/tmwa/loginhandler.cpp:172
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
+#: src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
-"Du wurdest zeitweise, bis %s vom Spiel ausgeschlossen.\n"
-"Bitte wende dich mittels des Forums an das GM Team."
-
-#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Du hast Dich entschieden, dem Irdischen zu entsagen."
+"Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen freien "
+"Platz mehr."
 
-#: ../src/net/tmwa/partyhandler.cpp:241
-msgid "You have left the party."
-msgstr "Du hast die Party verlassen."
+#: src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
 
-#: ../src/net/tmwa/specialhandler.cpp:180
-msgid "You have no memos!"
-msgstr "Keine Memos vorhanden!"
+#: src/playerrelations.cpp:310
+msgid "Completely ignore"
+msgstr "@@ignore|Ignoriere %s komplett@@"
 
-#: ../src/net/tmwa/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Dein Level ist noch nicht hoch genug!"
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
+msgstr "Drucke '..'"
 
-#: ../src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
-"Der Client muss neugestartet werden, wenn die neue Musik heruntergeladen "
-"werden soll"
+#: src/playerrelations.cpp:340
+msgid "Blink name"
+msgstr "Blinkender Name"
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
-msgstr "Bitte neustarten um Änderungen zu übernehmen."
+#: src/playerrelations.cpp:379
+msgid "Floating '...' bubble"
+msgstr "Schwebende '...' Blase"
 
-#: ../src/net/tmwa/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "Du brauchst noch einen blauen Edelstein!"
+#: src/playerrelations.cpp:382
+msgid "Floating bubble"
+msgstr "Schwebende Blase"
 
-#: ../src/net/tmwa/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "Du brauchst noch einen roten Edelstein!"
+#: src/resources/itemdb.cpp:53
+#, c-format
+msgid "Attack %+d"
+msgstr "Angriff %+d"
 
-#: ../src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
-msgstr "Du musst auf der Webseite ein Konto für diesen Server erstellen."
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "Verteidigung %+d"
 
-#: ../src/localplayer.cpp:1276
-#, fuzzy, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Du hast %s [@@%d|%s@@] aufgehoben."
-msgstr[1] "Du hast %s [@@%d|%s@@] aufgehoben."
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: ../src/net/tmwa/playerhandler.cpp:344
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "You picked up %s."
-msgstr "Du hast %s aufgehoben "
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir ein "
-"paar Neue."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Unbekannter Gegenstand"
 
-#: ../src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-"Du hast für das Captcha zu lange gebraucht oder deine Eingabe war inkorrekt."
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "unbenannt"
 
-#: ../src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "Du bist ein wenig steif."
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: ../src/net/tmwa/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "Du schleppst zu viel herum um das zu machen!"
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: ../src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "Du bist nicht tot. Du erholst Dich bloß."
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: ../src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
-msgstr "Du kriegst nichts mehr mit."
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Geld: %d"
 
-#: ../src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr "Du schmachtest nach den Fjorden."
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Job:"
 
-#: ../src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "Deine Zeit ist abgelaufen. Zeit, deinem Schöpfer gegenüberzutreten."
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Stufe: %d"
 
-#: ../src/net/tmwa/playerhandler.cpp:136
-msgid "You've kicked the bucket."
-msgstr "Jetzt passt Du in 'nen Eimer."
+#~ msgid "Access denied."
+#~ msgstr "Zugang verweigert"
 
-#: ../src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr ""
-"Du hast Deine sterbliche Hülle abgelegt, der Schleier legt sich über Dich "
-"und Du trittst dem Chor der blutenden Unsichtbaren bei."
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Unbekannter Fehler bei Auswahl des Charakters"
 
-#: ../src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
-msgstr "Deine Gilde ist voll."
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Einladungen auf diesem Weg werden im Moment nicht unterstützt."
 
-#: ../src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "Deine Körperfunktionen sind nun Geschichte."
+#~ msgid "Willpower:"
+#~ msgstr "Willenskraft:"
 
-#: ../src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
+#~ msgid "Willpower %+d"
+#~ msgstr "Willensstärke %+d"
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
-"nicht ganz so genial, wie Du dachtest..."
+#~ msgid "Willpower"
+#~ msgstr "Willenskraft:"
 
-#: ../src/gui/setup_video.cpp:233
-msgid "as particle"
-msgstr "als Partikeleffekt"
+#~ msgid "Server is full."
+#~ msgstr "Server ist voll"
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "Hoch"
+#~ msgid "Text Shadow"
+#~ msgstr "Textschatten"
 
-#: ../src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "im Chatfenster"
+#~ msgid "Text Outline"
+#~ msgstr "Textaußenlinie"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "Niedrig"
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Fortschrittsbalkenbeschriftungen"
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr "mana [Optionen] [mana-Datei]"
+#~ msgid "Buttons"
+#~ msgstr "Buttons"
 
-#: ../src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "max"
+#~ msgid "Disabled Buttons"
+#~ msgstr "Deaktivierte Buttons"
 
-#: ../src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "Mittel"
+#~ msgid "Tabs"
+#~ msgstr "Tabs"
 
-#: ../src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "Aus"
+#~ msgid "Background"
+#~ msgstr "Hintergrund"
 
-#: ../src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr "benötigt eine neuere Version"
+#~ msgid "Highlight"
+#~ msgstr "Hervorgehoben"
 
-#: ../src/gui/serverdialog.cpp:558
-#, c-format
-msgid "requires v%s"
-msgstr "benötigt v%s"
+#~ msgid "Tab Highlight"
+#~ msgstr "Hervorgehobener Tab"
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
-msgid "unnamed"
-msgstr "unbenannt"
+#~ msgid "Item Too Expensive"
+#~ msgstr "Gegenstand ist zu teuer"
 
-#~ msgid ""
-#~ "\n"
-#~ "> Cancel\n"
-#~ msgstr ""
-#~ "\n"
-#~ "> Abbrechen\n"
+#~ msgid "Item Is Equipped"
+#~ msgstr "Gegenstand ist in Verwendung"
 
-#, fuzzy
-#~ msgid " "
-#~ msgstr "; "
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#~ msgid "  -D --default    : Bypass the login process with default settings"
-#~ msgstr "  -D --default : Ãœberspringe die Anmeldung mit den Voreinstellungen"
+#~ msgid "Player"
+#~ msgstr "Spieler"
 
-#, fuzzy
-#~ msgid " (%+d)"
-#~ msgstr "HP %+d"
+#~ msgid "Whisper"
+#~ msgstr "geflüsterte Nachricht"
 
-#, fuzzy
-#~ msgid " : "
-#~ msgstr " host: "
+#~ msgid "Is"
+#~ msgstr "Handlungen"
 
-#~ msgid " cancelled"
-#~ msgstr " abgebrochen"
+#~ msgid "Server"
+#~ msgstr "Server"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Reaktion:"
+#~ msgid "Logger"
+#~ msgstr "Logger"
 
-#~ msgid "%s already here"
-#~ msgstr "%s ist bereits hier"
+#~ msgid "Hyperlink"
+#~ msgstr "Verknüpfung"
 
-#~ msgid "%s/%s"
-#~ msgstr "%s: %s"
+#~ msgid "Being"
+#~ msgstr "Aktionen"
 
-#~ msgid "%s: %s\n"
-#~ msgstr "%s: %s\n"
+#~ msgid "Other Players' Names"
+#~ msgstr "Namen anderer Spieler"
 
-#~ msgid ", coordinates: "
-#~ msgstr ", Koordinaten: "
+#~ msgid "Own Name"
+#~ msgstr "Eigener Name"
 
-#~ msgid "-1"
-#~ msgstr "-1"
+#~ msgid "GM Names"
+#~ msgstr "Namen von GM"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Ersatz für create"
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 HP Leiste"
+#~ msgid "Monsters"
+#~ msgstr "Monster"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 HP Leiste"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Unbekannter Gegenstand"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "zweihändige Waffen"
+#~ msgid "Generics"
+#~ msgstr "Allgemeiner Gegenstand"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 HP Leiste"
+#~ msgid "Hats"
+#~ msgstr "Hüte"
 
-#~ msgid ":-)"
-#~ msgstr ":-)"
+#~ msgid "Usables"
+#~ msgstr "Benutzbare Gegenstände"
 
-#~ msgid "Access denied."
-#~ msgstr "Zugang verweigert"
+#~ msgid "Shirts"
+#~ msgstr "Hemden"
 
-#~ msgid "Accountserver: Not logged in"
-#~ msgstr "nicht angemeldet"
+#~ msgid "One Handed Weapons"
+#~ msgstr "Einhänder"
 
-#~ msgid "Accountserver: Unknown error"
-#~ msgstr "Unbekannter Fehler"
+#~ msgid "Pants"
+#~ msgstr "Hosen"
 
-#~ msgid "Accountserver: Wrong username or password"
-#~ msgstr "Benutzername oder Passwort falsch"
+#~ msgid "Shoes"
+#~ msgstr "Schuhe"
 
-#~ msgid "Add Entry"
-#~ msgstr "Neuer Eintrag"
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Zweihänder"
 
-#~ msgid "Adjust scrolling by %d:%d"
-#~ msgstr "Justiere Scrolling %d:%d"
+#~ msgid "Shields"
+#~ msgstr "Schilde"
 
-#~ msgid "Ammo"
-#~ msgstr "Munition"
+#~ msgid "Rings"
+#~ msgstr "Ringe"
+
+#~ msgid "Necklaces"
+#~ msgstr "Halsketten"
 
 #~ msgid "Arms"
 #~ msgstr "Waffen"
 
-#~ msgid "Arrows equipped: %i"
-#~ msgstr "Pfeile ausgerüstet: %i"
+#~ msgid "Ammo"
+#~ msgstr "Munition"
 
-#~ msgid "Attack:"
-#~ msgstr "Angriff:"
+#~ msgid "Particle Effects"
+#~ msgstr "Partikeleffekte"
 
-#~ msgid "Axe"
-#~ msgstr "Axt"
+#~ msgid "Pickup Notification"
+#~ msgstr "aufgehobene Gegenstände"
 
-#~ msgid "Background"
-#~ msgstr "Hintergrund"
+#~ msgid "Exp Notification"
+#~ msgstr "Anzeige der Erfahrungspunkte"
 
-#~ msgid "Bow"
-#~ msgstr "Bogen"
+#~ msgid "Player Hits Monster"
+#~ msgstr "Spieler trifft Monster"
 
-#~ msgid "Buddy"
-#~ msgstr "Freund"
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monster trifft Spieler"
 
-#~ msgid "Buddy List"
-#~ msgstr "Freundesliste"
+#~ msgid "Critical Hit"
+#~ msgstr "Kritischer Treffer"
 
-#~ msgid "Buddys"
-#~ msgstr "Freunde"
+#~ msgid "Misses"
+#~ msgstr "Verfehlt"
 
-#~ msgid "Buttons"
-#~ msgstr "Buttons"
+#~ msgid "HP Bar"
+#~ msgstr "HP-Leiste"
 
-#, fuzzy
-#~ msgid "BuySell"
-#~ msgstr "Verkaufen"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 HP-Leiste"
 
-#, fuzzy
-#~ msgid "Can't create %s. Using defaults."
-#~ msgstr "Chat-Erstellung fehlgeschlagen!"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 HP-Leiste"
 
-#~ msgid "Can't find Resources directory\n"
-#~ msgstr "Kann das Ressourcen Verzeichnis nicht finden\n"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 HP-Leiste"
 
-#~ msgid "Cancel pressed"
-#~ msgstr "Abbrechen wurde gedrückt"
+#~ msgid "help"
+#~ msgstr "Hilfe"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Spruch 1 sprechen"
+#~ msgid "announce"
+#~ msgstr "ankündigen"
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Spruch 2 sprechen"
+#~ msgid "where"
+#~ msgstr "Wo"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Spruch 3 sprechen"
+#~ msgid "who"
+#~ msgstr "Wer"
 
-#~ msgid "Chatserver: Unknown error"
-#~ msgstr "Unbekannter Fehler"
+#~ msgid "whisper"
+#~ msgstr "geflüsterte Nachricht"
 
-#~ msgid "Color"
-#~ msgstr "Farbe"
+#~ msgid "ignore"
+#~ msgstr "Ignoriere"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Befehl: /new <Party-Name>"
+#~ msgid "unignore"
+#~ msgstr "nicht ignorieren"
 
-#~ msgid "Connection problem: %i"
-#~ msgstr "Verbindungsproblem: %i"
+#, fuzzy
+#~ msgid "join"
+#~ msgstr "Anmelden"
 
-#~ msgid "Cost"
-#~ msgstr "Preis"
+#, fuzzy
+#~ msgid "list"
+#~ msgstr "Aufteilen"
 
 #, fuzzy
-#~ msgid "Couldn't load news"
-#~ msgstr "Karte konnte nicht geladen werden"
+#~ msgid "clear"
+#~ msgstr "Waffenarm"
 
-#~ msgid "Couldn't set "
-#~ msgstr "Konnte Einstellung nicht setzen: "
+#~ msgid "party"
+#~ msgstr "Party"
 
-#~ msgid "Couldn't set %dx%dx%d video mode: %s"
-#~ msgstr "Kann Videomodus %dx%dx%d nicht setzten: %s"
+#~ msgid "me"
+#~ msgstr "ich"
 
-#~ msgid "Craft"
-#~ msgstr "Handwerk"
+#~ msgid "record"
+#~ msgstr "nehme auf"
 
-#~ msgid "Crafts"
-#~ msgstr "Handwerk"
+#, fuzzy
+#~ msgid "toggle"
+#~ msgstr "Logger"
 
-#~ msgid "Delay"
-#~ msgstr "Verzögerung: "
+#~ msgid "present"
+#~ msgstr "Anwesend: "
 
-#~ msgid "Description: %s"
-#~ msgstr "Beschreibung: %s"
+#~ msgid "n"
+#~ msgstr "Nein"
 
-#~ msgid "Disabled Buttons"
-#~ msgstr "Deaktivierte Buttons"
+#~ msgid "N"
+#~ msgstr "Nein"
 
-#~ msgid "Effect: %s"
-#~ msgstr "Effekt: %s"
+#~ msgid ", coordinates: "
+#~ msgstr ", Koordinaten: "
 
-#~ msgid "Emote Window"
-#~ msgstr "Gefühlsfenster"
+#, fuzzy
+#~ msgid " "
+#~ msgstr "; "
+
+#, fuzzy
+#~ msgid "ItemShortcut"
+#~ msgstr "Kurztaste %d"
 
 #, fuzzy
 #~ msgid "EmoteShortcut"
 #~ msgstr "Gefühlstaste %d"
 
 #, fuzzy
-#~ msgid "EnableSync"
-#~ msgstr "Joystick aktivieren"
+#~ msgid "logToChat"
+#~ msgstr "Chat"
 
 #, fuzzy
-#~ msgid "Error loading skills file: %s"
-#~ msgstr "Fehler beim Laden von %s"
+#~ msgid "fpslimit"
+#~ msgstr "Aufteilen"
 
 #, fuzzy
-#~ msgid "Error loading specials file: %s"
-#~ msgstr "Fehler beim Laden von %s"
+#~ msgid "Mana_Screenshot_"
+#~ msgstr "Bildschirmfoto"
 
 #, fuzzy
-#~ msgid "Error loading update file: %s"
-#~ msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
+#~ msgid "cancel"
+#~ msgstr "Abbrechen"
 
 #, fuzzy
-#~ msgid "Error: %s can't be made, but doesn't exist!"
-#~ msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
+#~ msgid "index"
+#~ msgstr "Im Fenster"
 
-#, fuzzy
-#~ msgid "Error: %s/%s can't be made, but doesn't exist!"
-#~ msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
+#~ msgid "inc"
+#~ msgstr "Verringern"
 
 #, fuzzy
-#~ msgid "Error: Invalid update host: %s"
-#~ msgstr "Ungültiger Updateserver: "
+#~ msgid "buy"
+#~ msgstr "Kaufen"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Konnte Auflösung nicht ändern in "
+#, fuzzy
+#~ msgid "quit"
+#~ msgstr "Beenden"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#~ msgid "Description: %s"
+#~ msgstr "Beschreibung: %s"
 
-#~ msgid "Generics"
-#~ msgstr "Allgemeiner Gegenstand"
+#~ msgid "Effect: %s"
+#~ msgstr "Effekt: %s"
 
 #, fuzzy
-#~ msgid "Gradient"
-#~ msgstr "Handeln"
-
-#~ msgid "Guilds"
-#~ msgstr "Gilden"
-
-#~ msgid "HP Bar"
-#~ msgstr "HP Leiste"
+#~ msgid "BuySell"
+#~ msgstr "Verkaufen"
 
-#~ msgid "Hats"
-#~ msgstr "Hüte"
+#~ msgid "change_password"
+#~ msgstr "Passwort ändern"
 
-#~ msgid "Highlight"
-#~ msgstr "Hervorgehoben"
+#~ msgid "create"
+#~ msgstr "Erstellen"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Verknüpfung"
+#~ msgid "yes"
+#~ msgstr "Ja"
 
 #, fuzzy
-#~ msgid "Invalid guild event"
-#~ msgstr "Ungültiger Updateserver: "
+#~ msgid "unregister"
+#~ msgstr "Abmelden"
 
-#~ msgid "Invite User"
-#~ msgstr "Spieler einladen"
+#~ msgid "use"
+#~ msgstr "benutze"
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Einladungen auf diesem Weg werden im Moment nicht unterstützt."
+#~ msgid "new"
+#~ msgstr "Neu"
 
-#~ msgid "Is"
-#~ msgstr "Handlungen"
+#~ msgid "delete"
+#~ msgstr "Löschen"
 
-#~ msgid "Item Is Equipped"
-#~ msgstr "Gegenstand ist in Verwendung"
+#~ msgid "Level %d"
+#~ msgstr "Stufe: %d"
 
-#~ msgid "Item Too Expensive"
-#~ msgstr "Gegenstand ist zu teuer"
+#, fuzzy
+#~ msgid "ReturnToggles"
+#~ msgstr "Enter-Taste schließt Chatzeile."
 
-#~ msgid "ItemDB: Error while loading items.xml!"
-#~ msgstr "Fehler beim Laden von item.xml!"
+#~ msgid "whispertab"
+#~ msgstr "geflüsterte Nachricht"
 
 #, fuzzy
-#~ msgid "ItemShortcut"
-#~ msgstr "Kurztaste %d"
-
-#~ msgid "Job Level: %d"
-#~ msgstr "Beruf Stufe: %d"
+#~ msgid " : "
+#~ msgstr " host: "
 
-#~ msgid "Level %d"
-#~ msgstr "Stufe: %d"
+#~ msgid "no"
+#~ msgstr "Nein"
 
-#~ msgid "Level Progress Update"
-#~ msgstr "Levelaufstiegsfortschritt"
+#~ msgid "Cancel pressed"
+#~ msgstr "Abbrechen wurde gedrückt"
 
-#~ msgid "Logger"
-#~ msgstr "Logger"
+#~ msgid "Music: "
+#~ msgstr "Lautstärke der Musik: "
 
-#, fuzzy
-#~ msgid "Mana"
-#~ msgstr "Mana"
+#~ msgid "music"
+#~ msgstr "Musik"
 
-#~ msgid "Mana %s"
-#~ msgstr "Mana: %s"
+#~ msgid "Minimap: "
+#~ msgstr "Ãœbersichtskarte: "
 
-#, fuzzy
-#~ msgid "Mana_Screenshot_"
-#~ msgstr "Bildschirmfoto"
+#~ msgid "minimap"
+#~ msgstr "Ãœbersichtskarte"
 
 #~ msgid "Map: "
 #~ msgstr "Karte: "
 
-#~ msgid "Max level"
-#~ msgstr "Max Level"
+#, fuzzy
+#~ msgid "_filename"
+#~ msgstr "Sichtbare Namen"
 
-#~ msgid "Memorizing selected character %s"
-#~ msgstr "Speichere den gewählten Charakter %s"
+#~ msgid "unequip"
+#~ msgstr "Ausziehen"
 
-#~ msgid "Minimap"
-#~ msgstr "Ãœbersichtskarte"
+#~ msgid "Invite User"
+#~ msgstr "Spieler einladen"
 
-#~ msgid "Minimap: "
-#~ msgstr "Ãœbersichtskarte: "
+#~ msgid "Quit Guild"
+#~ msgstr "Gilde verlassen"
 
-#~ msgid "Music: "
-#~ msgstr "Lautstärke der Musik: "
+#~ msgid "close"
+#~ msgstr "Schließen"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Unbekannter Skill"
+#~ msgid "help/"
+#~ msgstr "Hilfe"
 
-#~ msgid "N"
-#~ msgstr "Nein"
+#~ msgid "drop"
+#~ msgstr "Wegwerfen"
 
-#~ msgid "NPC Number Request"
-#~ msgstr "NPC Nummer Anfrage"
+#~ msgid "split"
+#~ msgstr "Aufteilen"
 
-#~ msgid "NPC Text Request"
-#~ msgstr "NPC text Anfrage"
+#~ msgid "%s/%s"
+#~ msgstr "%s: %s"
 
-#~ msgid "Necklaces"
-#~ msgstr "Halsketten"
+#~ msgid "all"
+#~ msgstr "alle"
 
-#~ msgid "Network error: %s"
-#~ msgstr "Netzwerkfehler: %s"
+#~ msgid "register"
+#~ msgstr "Registrieren"
 
-#~ msgid "Network: Server: %s (%s:%d)"
-#~ msgstr "Netzwerk: Server: %s (%s:%d)"
+#~ msgid "server"
+#~ msgstr "Server"
 
-#, fuzzy
-#~ msgid "No modes available"
-#~ msgstr "Keine Server verfügbar"
+#~ msgid "login"
+#~ msgstr "Anmelden"
+
+#~ msgid "Minimap"
+#~ msgstr "Ãœbersichtskarte"
+
+#~ msgid "Show"
+#~ msgstr "Zeigen"
 
 #~ msgid "NpcText"
 #~ msgstr "NpcText"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#~ msgid "reset"
+#~ msgstr "Zurücksetzten"
 
-#~ msgid "One Handed Weapons"
-#~ msgstr "Einhänder"
+#~ msgid "send"
+#~ msgstr "Senden"
 
-#~ msgid "OutfitUnequip"
-#~ msgstr "Ausziehen"
+#~ msgid "previous"
+#~ msgstr "Zurück"
+
+#~ msgid "next"
+#~ msgstr "Weiter"
 
 #~ msgid "OutfitUnequip0"
 #~ msgstr "Ausziehen"
 
-#~ msgid "Pants"
-#~ msgstr "Hosen"
+#~ msgid "-1"
+#~ msgstr "-1"
 
-#~ msgid "Party Window"
-#~ msgstr "Partyfenster"
+#~ msgid "OutfitUnequip"
+#~ msgstr "Ausziehen"
 
-#~ msgid "Player"
-#~ msgstr "Spieler"
+#~ msgid "Color"
+#~ msgstr "Farbe"
 
-#~ msgid "PopupMenu: Warning, unknown action '%s'"
-#~ msgstr "PopupMenu: Warnung, unbekannte Aktion '%s'"
+#, fuzzy
+#~ msgid "Gradient"
+#~ msgstr "Handeln"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Fortschrittsbalkenbeschriftungen"
+#~ msgid "Delay"
+#~ msgstr "Verzögerung: "
 
-#~ msgid "Quit Guild"
-#~ msgstr "Gilde verlassen"
+#~ msgid "talk"
+#~ msgstr "Sprechen"
 
-#~ msgid "Quitting"
-#~ msgstr "Beenden"
+#~ msgid "trade"
+#~ msgstr "Handeln"
 
-#~ msgid "Received update host \"%s\" from login server."
-#~ msgstr "Empfange Updateserver \"%s\" vom Loginserver"
+#~ msgid "attack"
+#~ msgstr "Angriff"
 
-#~ msgid "Recorder"
-#~ msgstr "Aufzeichnung"
+#, fuzzy
+#~ msgid "disregard"
+#~ msgstr "Unbeachtet"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Verbleibende Statuspunkte: %d"
+#~ msgid "friend"
+#~ msgstr "Freund"
 
-#, fuzzy
-#~ msgid "ReturnToggles"
-#~ msgstr "Enter-Taste schließt Chatzeile."
+#~ msgid "guild"
+#~ msgstr "Gilde"
 
-#~ msgid "Rings"
-#~ msgstr "Ringe"
+#~ msgid "pickup"
+#~ msgstr "Aufheben"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Scroll-Trägheit"
+#~ msgid "look"
+#~ msgstr "Schauen "
 
-#~ msgid "Scroll radius"
-#~ msgstr "Scroll-Radius"
+#~ msgid "chat"
+#~ msgstr "Chat"
 
-#~ msgid "Server"
-#~ msgstr "Server"
+#~ msgid "store"
+#~ msgstr "Einlagern"
 
-#~ msgid "Shields"
-#~ msgstr "Schilde"
+#~ msgid "retrieve"
+#~ msgstr "Abholen"
 
-#~ msgid "Shirts"
-#~ msgstr "Hemden"
+#~ msgid "name"
+#~ msgstr "Name"
 
-#~ msgid "Shoes"
-#~ msgstr "Schuhe"
+#~ msgid "PopupMenu: Warning, unknown action '%s'"
+#~ msgstr "PopupMenu: Warnung, unbekannte Aktion '%s'"
 
-#~ msgid "Show"
-#~ msgstr "Zeigen"
+#~ msgid "Recorder"
+#~ msgstr "Aufzeichnung"
 
-#~ msgid "Slots: "
-#~ msgstr "Plätze: "
+#~ msgid "sex"
+#~ msgstr "Geschlecht"
 
-#~ msgid "Stats"
-#~ msgstr "Fähigkeiten"
+#~ msgid "The queue is empty."
+#~ msgstr "Die Warteschlange ist leer."
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Hervorgehobener Tab"
+#~ msgid "sell"
+#~ msgstr "Verkaufen"
 
-#~ msgid "Tabs"
-#~ msgstr "Tabs"
+#~ msgid "connect"
+#~ msgstr "Verbinde..."
 
-#~ msgid "Text Outline"
-#~ msgstr "Textaußenlinie"
+#~ msgid "Add Entry"
+#~ msgstr "Neuer Eintrag"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Textschatten"
+#~ msgid "type"
+#~ msgstr "Typ: "
 
 #, fuzzy
-#~ msgid "The Mana World"
-#~ msgstr "The Mana World %s"
+#~ msgid "unknown"
+#~ msgstr "Unbekannter Gegenstand"
 
-#~ msgid "The Mana World %s"
-#~ msgstr "The Mana World %s"
+#~ msgid "connection"
+#~ msgstr "Verbindung"
 
-#~ msgid "The queue is empty."
-#~ msgstr "Die Warteschlange ist leer."
+#~ msgid "manaserv"
+#~ msgstr "manaserver"
 
-#~ msgid "Total"
-#~ msgstr "Gesamt"
+#, fuzzy
+#~ msgid "eathena"
+#~ msgstr "Erstellen"
 
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Zweihänder"
+#~ msgid "hostname"
+#~ msgstr "Servername"
 
-#~ msgid "Unable to load selection.png"
-#~ msgstr "Konnte selection.png nicht laden"
+#~ msgid "port"
+#~ msgstr "Port:"
 
-#~ msgid "Unarmed"
-#~ msgstr "Unbewaffnet"
+#~ msgid "musicVolume"
+#~ msgstr "Lautstärke der Musik"
 
-#~ msgid "Unhandled packet: %x"
-#~ msgstr "Nicht behandeltes Paket : %x"
+#~ msgid "sfxVolume"
+#~ msgstr "Lautstärke der Klangeffekte"
 
-#~ msgid "Unknown : "
-#~ msgstr "Unbekannt: "
+#~ msgid "sound"
+#~ msgstr "Ton"
 
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Unbekannter Fehler bei Auswahl des Charakters"
+#~ msgid "calibrate"
+#~ msgstr "Kalibrieren"
 
-#~ msgid "Unknown party exp option: %d\n"
-#~ msgstr "Unbekannte Party exp Option: %d\n"
+#~ msgid "joystickEnabled"
+#~ msgstr "Joystick"
 
-#~ msgid "Unknown party item option: %d\n"
-#~ msgstr "Unbekannte Party Item Option: %d\n"
+#~ msgid "makeDefault"
+#~ msgstr "stelle Standardeinstellungen her"
 
-#~ msgid "Usables"
-#~ msgstr "Benutzbare Gegenstände"
+#~ msgid "whisper tab"
+#~ msgstr "geflüsterte Nachricht"
 
-#~ msgid "Username is %s"
-#~ msgstr "Benutzername ist %s"
+#, fuzzy
+#~ msgid "No modes available"
+#~ msgstr "Keine Server verfügbar"
 
-#~ msgid "Warning this server does not have a %s file falling back to %s"
-#~ msgstr ""
-#~ "Dieser Server besitzt keine %s Datei. Benutze stattdessen die Datei %s"
+#, fuzzy
+#~ msgid "screen"
+#~ msgstr "Vollbild"
 
-#~ msgid "Warping to %s (%d, %d)"
-#~ msgstr "Flüsternd zu %s: (%d ,%d)"
+#~ msgid "customcursor"
+#~ msgstr "Benutzerdefinierter Zeiger"
 
-#~ msgid "Weapons"
-#~ msgstr "Waffen"
+#~ msgid "visiblenames"
+#~ msgstr "Sichtbare Namen"
 
-#~ msgid "Welcome"
-#~ msgstr "Wilkommen"
+#~ msgid "particleeffects"
+#~ msgstr "Partikeleffekte"
 
-#~ msgid "Whisper"
-#~ msgstr "geflüsterte Nachricht"
+#~ msgid "showownname"
+#~ msgstr "Zeige eigenen Namen"
 
-#~ msgid "Willpower:"
-#~ msgstr "Willenskraft:"
+#~ msgid "showpickupchat"
+#~ msgstr "Benachrichtigung beim Aufheben"
 
 #, fuzzy
-#~ msgid "_filename"
-#~ msgstr "Sichtbare Namen"
-
-#~ msgid "a"
-#~ msgstr "ein"
+#~ msgid "showpickupparticle"
+#~ msgstr "als Partikeleffekt"
 
 #, fuzzy
-#~ msgid "action"
-#~ msgstr "Beziehung"
+#~ msgid "fontSize"
+#~ msgstr "Schriftgröße"
 
 #, fuzzy
-#~ msgid "add"
-#~ msgstr "Hinzufügen"
+#~ msgid "videomode"
+#~ msgstr " Auflösung: "
 
 #, fuzzy
-#~ msgid "agi"
-#~ msgstr "Magie"
-
-#~ msgid "all"
-#~ msgstr "alle"
-
-#~ msgid "announce"
-#~ msgstr "ankündigen"
+#~ msgid "pickupchat"
+#~ msgstr "Aufheben"
 
 #, fuzzy
-#~ msgid "appName"
-#~ msgstr "Name"
+#~ msgid "pickupparticle"
+#~ msgstr "als Partikeleffekt"
 
 #, fuzzy
-#~ msgid "appShort"
-#~ msgstr "Tastenkürzel"
-
-#~ msgid "attack"
-#~ msgstr "Angriff"
-
-#~ msgid "attack-range"
-#~ msgstr "Angriffsreichweite"
-
-#~ msgid "axe"
-#~ msgstr "Axt"
+#~ msgid "particledetailslider"
+#~ msgstr "Partikeldetail"
 
 #, fuzzy
-#~ msgid "blinkname"
-#~ msgstr "Unbenannt"
-
-#~ msgid "bow"
-#~ msgstr "Bogen"
+#~ msgid "particledetailfield"
+#~ msgstr "Partikeldetail"
 
 #, fuzzy
-#~ msgid "buy"
-#~ msgstr "Kaufen"
-
-#~ msgid "calibrate"
-#~ msgstr "Kalibrieren"
+#~ msgid "screenheight"
+#~ msgstr "Bildschirmfoto"
 
 #, fuzzy
-#~ msgid "cancel"
-#~ msgstr "Abbrechen"
-
-#~ msgid "change_password"
-#~ msgstr "Passwort ändern"
-
-#~ msgid "character"
-#~ msgstr "Spielfigur"
-
-#~ msgid "chat"
-#~ msgstr "Chat"
+#~ msgid "skills"
+#~ msgstr "Fertigkeiten"
 
 #, fuzzy
-#~ msgid "clear"
-#~ msgstr "Waffenarm"
-
-#~ msgid "close"
-#~ msgstr "Schließen"
-
-#~ msgid "connect"
-#~ msgstr "Verbinde..."
-
-#~ msgid "connection"
-#~ msgstr "Verbindung"
+#~ msgid "Error loading skills file: %s"
+#~ msgstr "Fehler beim Laden von %s"
 
-#~ msgid "create"
-#~ msgstr "Erstellen"
+#, fuzzy
+#~ msgid "set"
+#~ msgstr "Zurücksetzten"
 
-#~ msgid "curl error "
-#~ msgstr "curl fehler "
+#, fuzzy
+#~ msgid "skill"
+#~ msgstr "Fertigkeiten"
 
-#~ msgid "customcursor"
-#~ msgstr "Benutzerdefinierter Zeiger"
+#, fuzzy
+#~ msgid "Error loading specials file: %s"
+#~ msgstr "Fehler beim Laden von %s"
 
-#~ msgid "default"
-#~ msgstr "Standard"
+#, fuzzy
+#~ msgid " (%+d)"
+#~ msgstr "HP %+d"
 
 #, fuzzy
-#~ msgid "defaultPort"
-#~ msgstr "Standard"
+#~ msgid "add"
+#~ msgstr "Hinzufügen"
 
 #, fuzzy
-#~ msgid "defaultServer"
-#~ msgstr "Server auswählen"
+#~ msgid "money"
+#~ msgstr "Gefühle"
 
-#~ msgid "defense"
-#~ msgstr "Verteidigung:"
+#, fuzzy
+#~ msgid "Error loading update file: %s"
+#~ msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#~ msgid "delete"
-#~ msgstr "Löschen"
+#, fuzzy
+#~ msgid "file"
+#~ msgstr "Grinsen"
 
 #, fuzzy
 #~ msgid "description"
 #~ msgstr "Beschreibung: %s"
 
 #, fuzzy
-#~ msgid "disregard"
-#~ msgstr "Unbeachtet"
-
-#~ msgid "drop"
-#~ msgstr "Wegwerfen"
+#~ msgid "play"
+#~ msgstr "Los!"
 
 #, fuzzy
-#~ msgid "eathena"
-#~ msgstr "Erstellen"
+#~ msgid "Couldn't load news"
+#~ msgstr "Karte konnte nicht geladen werden"
 
-#~ msgid "effect"
-#~ msgstr "Effekt:"
+#~ msgid "Warning this server does not have a %s file falling back to %s"
+#~ msgstr ""
+#~ "Dieser Server besitzt keine %s Datei. Benutze stattdessen die Datei %s"
+
+#~ msgid "%s already here"
+#~ msgstr "%s ist bereits hier"
 
 #, fuzzy
-#~ msgid "emote0"
-#~ msgstr "Gefühle"
+#~ msgid "users"
+#~ msgstr "benutze"
 
 #, fuzzy
-#~ msgid "emote1"
-#~ msgstr "Gefühle"
+#~ msgid "topic"
+#~ msgstr "Stopp"
 
-#~ msgid "equip-1hand"
-#~ msgstr "Einhänder"
+#, fuzzy
+#~ msgid "op"
+#~ msgstr "Geschäft"
 
-#~ msgid "equip-2hand"
-#~ msgstr "Zweihänder"
+#, fuzzy
+#~ msgid "kick"
+#~ msgstr "Aufheben"
 
-#~ msgid "equip-ammo"
-#~ msgstr "Waffe"
+#~ msgid "Welcome"
+#~ msgstr "Wilkommen"
 
-#~ msgid "equip-arms"
-#~ msgstr "Armausrüstung"
+#~ msgid ":-)"
+#~ msgstr ":-)"
 
-#~ msgid "equip-feet"
-#~ msgstr "Schuhe & Stiefel"
+#~ msgid "Guilds"
+#~ msgstr "Gilden"
 
-#~ msgid "equip-head"
-#~ msgstr "Kopfbedeckung"
+#, fuzzy
+#~ msgid "world"
+#~ msgstr "Schwertpolarm"
 
-#~ msgid "equip-legs"
-#~ msgstr "Beinausrüstung"
+#, fuzzy
+#~ msgid "keyMoveUp"
+#~ msgstr "Laufe Hoch"
 
-#~ msgid "equip-necklace"
-#~ msgstr "Halsketten"
+#, fuzzy
+#~ msgid "keyMoveDown"
+#~ msgstr "Laufe Runter"
 
-#~ msgid "equip-ring"
-#~ msgstr "Ring"
+#, fuzzy
+#~ msgid "keyMoveLeft"
+#~ msgstr "Laufe nach Links"
 
-#~ msgid "equip-shield"
-#~ msgstr "Schilde"
+#, fuzzy
+#~ msgid "keyMoveRight"
+#~ msgstr "Laufe nach Rechts"
 
 #, fuzzy
-#~ msgid "event"
-#~ msgstr "Letzter Server:"
+#~ msgid "keyAttack"
+#~ msgstr "Angriff"
 
-#~ msgid "female"
-#~ msgstr "Weiblich"
+#, fuzzy
+#~ msgid "keyTargetAttack"
+#~ msgstr "Zielen & Angreifen"
 
 #, fuzzy
-#~ msgid "file"
+#~ msgid "keySmilie"
 #~ msgstr "Grinsen"
 
 #, fuzzy
-#~ msgid "fontSize"
-#~ msgstr "Schriftgröße"
+#~ msgid "keyTalk"
+#~ msgstr "Sprechen"
 
 #, fuzzy
-#~ msgid "fpslimit"
-#~ msgstr "Aufteilen"
+#~ msgid "keyTarget"
+#~ msgstr "NPC anvisieren"
 
-#~ msgid "friend"
-#~ msgstr "Freund"
+#, fuzzy
+#~ msgid "keyTargetClosest"
+#~ msgstr "Nächstes Ziel anvisieren"
 
-#~ msgid "generic"
-#~ msgstr "Allgemeiner Gegenstand"
+#, fuzzy
+#~ msgid "keyTargetNPC"
+#~ msgstr "NPC anvisieren"
 
-#~ msgid "guild"
-#~ msgstr "Gilde"
+#, fuzzy
+#~ msgid "keyTargetPlayer"
+#~ msgstr "Spieler anvisieren"
 
-#~ msgid "help"
-#~ msgstr "Hilfe"
+#, fuzzy
+#~ msgid "keyPickup"
+#~ msgstr "Aufheben"
 
-#~ msgid "help/"
-#~ msgstr "Hilfe"
+#, fuzzy
+#~ msgid "keyHideWindows"
+#~ msgstr "Fenster ausblenden"
 
-#~ msgid "hit"
-#~ msgstr "getroffen"
+#, fuzzy
+#~ msgid "keyBeingSit"
+#~ msgstr "Aktionen"
 
-#~ msgid "hostname"
-#~ msgstr "Servername"
+#, fuzzy
+#~ msgid "keyScreenshot"
+#~ msgstr "Bildschirmfoto"
 
 #, fuzzy
-#~ msgid "hp"
-#~ msgstr "Geschäft"
+#~ msgid "keyTrade"
+#~ msgstr "Handeln"
 
-#~ msgid "hurt"
-#~ msgstr "verletzten"
+#, fuzzy
+#~ msgid "keyShortcut1"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "hwaccel"
-#~ msgstr "Abbrechen"
+#~ msgid "keyShortcut2"
+#~ msgstr "Tastenkürzel"
 
-#~ msgid "ignore"
-#~ msgstr "Ignoriere"
+#, fuzzy
+#~ msgid "keyShortcut3"
+#~ msgstr "Tastenkürzel"
 
-#~ msgid "image"
-#~ msgstr "Bild"
+#, fuzzy
+#~ msgid "keyShortcut4"
+#~ msgstr "Tastenkürzel"
 
-#~ msgid "inc"
-#~ msgstr "Verringern"
+#, fuzzy
+#~ msgid "keyShortcut5"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "index"
-#~ msgstr "Im Fenster"
+#~ msgid "keyShortcut6"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "int"
-#~ msgstr "Sitzen"
+#~ msgid "keyShortcut7"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "join"
-#~ msgstr "Anmelden"
+#~ msgid "keyShortcut8"
+#~ msgstr "Tastenkürzel"
 
-#~ msgid "joystickEnabled"
-#~ msgstr "Joystick"
+#, fuzzy
+#~ msgid "keyShortcut9"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "keyAttack"
-#~ msgstr "Angriff"
+#~ msgid "keyShortcut10"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "keyBeingSit"
-#~ msgstr "Aktionen"
+#~ msgid "keyShortcut11"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "keyChat"
-#~ msgstr "Chat"
+#~ msgid "keyShortcut12"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "keyChatScrollDown"
-#~ msgstr "Im Chat runter scrollen"
+#~ msgid "keyWindowInventory"
+#~ msgstr "Inventar"
 
 #, fuzzy
-#~ msgid "keyEmoteShortcut1"
-#~ msgstr "Gefühlstaste %d"
+#~ msgid "keyWindowEquipment"
+#~ msgstr "Ausrüstung"
 
 #, fuzzy
-#~ msgid "keyEmoteShortcut10"
-#~ msgstr "Gefühlstaste %d"
+#~ msgid "keyWindowSkill"
+#~ msgstr "Unbekannte Fähigkeit"
 
 #, fuzzy
-#~ msgid "keyEmoteShortcut11"
-#~ msgstr "Gefühlstaste %d"
+#~ msgid "keyWindowShortcut"
+#~ msgstr "Tastenkürzel"
+
+#~ msgid "Party Window"
+#~ msgstr "Partyfenster"
 
 #, fuzzy
-#~ msgid "keyEmoteShortcut12"
+#~ msgid "keyEmoteShortcut1"
 #~ msgstr "Gefühlstaste %d"
 
 #, fuzzy
@@ -4583,486 +4518,497 @@ msgstr "unbenannt"
 #~ msgstr "Gefühlstaste %d"
 
 #, fuzzy
-#~ msgid "keyHideWindows"
-#~ msgstr "Fenster ausblenden"
-
-#, fuzzy
-#~ msgid "keyIgnoreInput1"
-#~ msgstr "Ignoriere Eingabe 1"
-
-#, fuzzy
-#~ msgid "keyIgnoreInput2"
-#~ msgstr "Ignoriere Eingabe 2"
-
-#, fuzzy
-#~ msgid "keyMoveDown"
-#~ msgstr "Laufe Runter"
+#~ msgid "keyEmoteShortcut10"
+#~ msgstr "Gefühlstaste %d"
 
 #, fuzzy
-#~ msgid "keyMoveLeft"
-#~ msgstr "Laufe nach Links"
+#~ msgid "keyEmoteShortcut11"
+#~ msgstr "Gefühlstaste %d"
 
 #, fuzzy
-#~ msgid "keyMoveRight"
-#~ msgstr "Laufe nach Rechts"
+#~ msgid "keyEmoteShortcut12"
+#~ msgstr "Gefühlstaste %d"
 
 #, fuzzy
-#~ msgid "keyMoveUp"
-#~ msgstr "Laufe Hoch"
+#~ msgid "keyChat"
+#~ msgstr "Chat"
 
 #, fuzzy
-#~ msgid "keyPickup"
-#~ msgstr "Aufheben"
+#~ msgid "keyChatScrollDown"
+#~ msgstr "Im Chat runter scrollen"
 
 #, fuzzy
 #~ msgid "keyQuit"
 #~ msgstr "Beenden"
 
 #, fuzzy
-#~ msgid "keyScreenshot"
-#~ msgstr "Bildschirmfoto"
-
-#, fuzzy
-#~ msgid "keyShortcut1"
-#~ msgstr "Tastenkürzel"
+#~ msgid "keyIgnoreInput1"
+#~ msgstr "Ignoriere Eingabe 1"
 
 #, fuzzy
-#~ msgid "keyShortcut10"
-#~ msgstr "Tastenkürzel"
+#~ msgid "keyIgnoreInput2"
+#~ msgstr "Ignoriere Eingabe 2"
 
 #, fuzzy
-#~ msgid "keyShortcut11"
-#~ msgstr "Tastenkürzel"
+#~ msgid "updatehost"
+#~ msgstr "Ungültiger Updateserver: "
 
 #, fuzzy
-#~ msgid "keyShortcut12"
-#~ msgstr "Tastenkürzel"
+#~ msgid "Error: Invalid update host: %s"
+#~ msgstr "Ungültiger Updateserver: "
 
 #, fuzzy
-#~ msgid "keyShortcut2"
-#~ msgstr "Tastenkürzel"
+#~ msgid "Error: %s can't be made, but doesn't exist!"
+#~ msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
 
 #, fuzzy
-#~ msgid "keyShortcut3"
-#~ msgstr "Tastenkürzel"
+#~ msgid "Error: %s/%s can't be made, but doesn't exist!"
+#~ msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
 
 #, fuzzy
-#~ msgid "keyShortcut4"
-#~ msgstr "Tastenkürzel"
+#~ msgid "appName"
+#~ msgstr "Name"
 
 #, fuzzy
-#~ msgid "keyShortcut5"
-#~ msgstr "Tastenkürzel"
+#~ msgid "Mana"
+#~ msgstr "Mana"
 
 #, fuzzy
-#~ msgid "keyShortcut6"
+#~ msgid "appShort"
 #~ msgstr "Tastenkürzel"
 
-#, fuzzy
-#~ msgid "keyShortcut7"
-#~ msgstr "Tastenkürzel"
+#~ msgid "mana"
+#~ msgstr "mana"
 
 #, fuzzy
-#~ msgid "keyShortcut8"
-#~ msgstr "Tastenkürzel"
+#~ msgid "defaultServer"
+#~ msgstr "Server auswählen"
 
 #, fuzzy
-#~ msgid "keyShortcut9"
-#~ msgstr "Tastenkürzel"
+#~ msgid "defaultPort"
+#~ msgstr "Standard"
 
 #, fuzzy
-#~ msgid "keySmilie"
-#~ msgstr "Grinsen"
+#~ msgid "hwaccel"
+#~ msgstr "Abbrechen"
 
 #, fuzzy
-#~ msgid "keyTalk"
-#~ msgstr "Sprechen"
+#~ msgid "Can't create %s. Using defaults."
+#~ msgstr "Chat-Erstellung fehlgeschlagen!"
 
 #, fuzzy
-#~ msgid "keyTarget"
-#~ msgstr "NPC anvisieren"
+#~ msgid "The Mana World"
+#~ msgstr "The Mana World %s"
 
-#, fuzzy
-#~ msgid "keyTargetAttack"
-#~ msgstr "Zielen & Angreifen"
+#~ msgid "Can't find Resources directory\n"
+#~ msgstr "Kann das Ressourcen Verzeichnis nicht finden\n"
 
-#, fuzzy
-#~ msgid "keyTargetClosest"
-#~ msgstr "Nächstes Ziel anvisieren"
+#~ msgid "Couldn't set %dx%dx%d video mode: %s"
+#~ msgstr "Kann Videomodus %dx%dx%d nicht setzten: %s"
 
-#, fuzzy
-#~ msgid "keyTargetNPC"
-#~ msgstr "NPC anvisieren"
+#~ msgid "The Mana World %s"
+#~ msgstr "The Mana World %s"
 
-#, fuzzy
-#~ msgid "keyTargetPlayer"
-#~ msgstr "Spieler anvisieren"
+#~ msgid "default"
+#~ msgstr "Standard"
 
-#, fuzzy
-#~ msgid "keyTrade"
-#~ msgstr "Handeln"
+#~ msgid "password"
+#~ msgstr "Passwort:"
 
-#, fuzzy
-#~ msgid "keyWindowEquipment"
-#~ msgstr "Ausrüstung"
+#~ msgid "character"
+#~ msgstr "Spielfigur"
 
-#, fuzzy
-#~ msgid "keyWindowInventory"
-#~ msgstr "Inventar"
+#~ msgid "update-host"
+#~ msgstr "Updateserver: "
 
-#, fuzzy
-#~ msgid "keyWindowShortcut"
-#~ msgstr "Tastenkürzel"
+#~ msgid "username"
+#~ msgstr "Benutztername"
 
-#, fuzzy
-#~ msgid "keyWindowSkill"
-#~ msgstr "Unbekannte Fähigkeit"
+#~ msgid "screenshot-dir"
+#~ msgstr "Bildschirmfotoordner"
 
-#, fuzzy
-#~ msgid "kick"
-#~ msgstr "Aufheben"
+#~ msgid "Username is %s"
+#~ msgstr "Benutzername ist %s"
 
-#~ msgid "knife"
-#~ msgstr "Messer"
+#~ msgid "Mana %s"
+#~ msgstr "Mana: %s"
 
-#~ msgid "large"
-#~ msgstr "groß"
+#~ msgid "loginMusic"
+#~ msgstr "Loginmusik"
 
 #~ msgid "lastCharacter"
 #~ msgstr "letzter Charakter"
 
-#~ msgid "leave"
-#~ msgstr "verlassen"
+#~ msgid "Memorizing selected character %s"
+#~ msgstr "Speichere den gewählten Charakter %s"
 
-#, fuzzy
-#~ msgid "list"
-#~ msgstr "Aufteilen"
+#~ msgid "Quitting"
+#~ msgstr "Beenden"
 
 #, fuzzy
-#~ msgid "logToChat"
-#~ msgstr "Chat"
+#~ msgid "EnableSync"
+#~ msgstr "Joystick aktivieren"
 
-#~ msgid "login"
-#~ msgstr "Anmelden"
+#, fuzzy
+#~ msgid "agi"
+#~ msgstr "Magie"
 
-#~ msgid "loginMusic"
-#~ msgstr "Loginmusik"
+#, fuzzy
+#~ msgid "vit"
+#~ msgstr "Sitzen"
 
-#~ msgid "look"
-#~ msgstr "Schauen "
+#, fuzzy
+#~ msgid "int"
+#~ msgstr "Sitzen"
 
 #~ msgid "luck"
 #~ msgstr "Glück"
 
-#~ msgid "mace"
-#~ msgstr "Irrgarten"
+#~ msgid "Connection problem: %i"
+#~ msgstr "Verbindungsproblem: %i"
 
-#~ msgid "makeDefault"
-#~ msgstr "stelle Standardeinstellungen her"
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Ersatz für create"
 
-#~ msgid "male"
-#~ msgstr "Männlich"
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Befehl: /new <Party-Name>"
 
-#~ msgid "mana"
-#~ msgstr "mana"
+#~ msgid "leave"
+#~ msgstr "verlassen"
 
-#~ msgid "manaserv"
-#~ msgstr "manaserver"
+#~ msgid "Arrows equipped: %i"
+#~ msgstr "Pfeile ausgerüstet: %i"
 
-#~ msgid "me"
-#~ msgstr "ich"
+#~ msgid "Received update host \"%s\" from login server."
+#~ msgstr "Empfange Updateserver \"%s\" vom Loginserver"
 
-#~ msgid "minimap"
-#~ msgstr "Ãœbersichtskarte"
+#~ msgid "Network: Server: %s (%s:%d)"
+#~ msgstr "Netzwerk: Server: %s (%s:%d)"
 
-#~ msgid "miss"
-#~ msgstr "verfehlt"
+#~ msgid "Unhandled packet: %x"
+#~ msgstr "Nicht behandeltes Paket : %x"
 
-#, fuzzy
-#~ msgid "money"
-#~ msgstr "Gefühle"
+#~ msgid "Network error: %s"
+#~ msgstr "Netzwerkfehler: %s"
 
-#~ msgid "monster"
-#~ msgstr "Monster"
+#~ msgid "Unknown party exp option: %d\n"
+#~ msgstr "Unbekannte Party exp Option: %d\n"
 
-#~ msgid "monsters"
-#~ msgstr "Monster"
+#~ msgid "Unknown party item option: %d\n"
+#~ msgstr "Unbekannte Party Item Option: %d\n"
 
-#~ msgid "music"
-#~ msgstr "Musik"
+#~ msgid "Warping to %s (%d, %d)"
+#~ msgstr "Flüsternd zu %s: (%d ,%d)"
 
-#~ msgid "musicVolume"
-#~ msgstr "Lautstärke der Musik"
+#~ msgid "Adjust scrolling by %d:%d"
+#~ msgstr "Justiere Scrolling %d:%d"
 
-#~ msgid "n"
-#~ msgstr "Nein"
+#~ msgid "Chatserver: Unknown error"
+#~ msgstr "Unbekannter Fehler"
 
-#~ msgid "name"
-#~ msgstr "Name"
+#~ msgid "Unknown : "
+#~ msgstr "Unbekannt: "
 
-#~ msgid "new"
-#~ msgstr "Neu"
+#, fuzzy
+#~ msgid "will"
+#~ msgstr "Fertigkeiten"
 
-#~ msgid "next"
-#~ msgstr "Weiter"
+#, fuzzy
+#~ msgid "Invalid guild event"
+#~ msgstr "Ungültiger Updateserver: "
 
-#~ msgid "no"
-#~ msgstr "Nein"
+#~ msgid "Accountserver: Not logged in"
+#~ msgstr "nicht angemeldet"
+
+#~ msgid "Accountserver: Unknown error"
+#~ msgstr "Unbekannter Fehler"
+
+#~ msgid "Accountserver: Wrong username or password"
+#~ msgstr "Benutzername oder Passwort falsch"
+
+#~ msgid "%s: %s\n"
+#~ msgstr "%s: %s\n"
+
+#~ msgid "Level Progress Update"
+#~ msgstr "Levelaufstiegsfortschritt"
 
 #~ msgid "nop"
 #~ msgstr "Nö"
 
 #, fuzzy
-#~ msgid "op"
-#~ msgstr "Geschäft"
+#~ msgid "emote0"
+#~ msgstr "Gefühle"
 
-#~ msgid "other"
-#~ msgstr "andere"
+#~ msgid "relation"
+#~ msgstr "Beziehung"
 
-#~ msgid "particle-effect"
-#~ msgstr "Partikeleffekte"
+#~ msgid "player"
+#~ msgstr "Spieler"
 
 #, fuzzy
-#~ msgid "particledetailfield"
-#~ msgstr "Partikeldetail"
+#~ msgid "blinkname"
+#~ msgstr "Unbenannt"
 
 #, fuzzy
-#~ msgid "particledetailslider"
-#~ msgstr "Partikeldetail"
+#~ msgid "emote1"
+#~ msgstr "Gefühle"
 
-#~ msgid "particleeffects"
-#~ msgstr "Partikeleffekte"
+#~ msgid "defense"
+#~ msgstr "Verteidigung:"
 
-#~ msgid "particlefx"
-#~ msgstr "als Partikeleffekt"
+#, fuzzy
+#~ msgid "hp"
+#~ msgstr "Geschäft"
 
-#~ msgid "party"
-#~ msgstr "Party"
+#~ msgid "generic"
+#~ msgstr "Allgemeiner Gegenstand"
 
-#~ msgid "password"
-#~ msgstr "Passwort:"
+#~ msgid "usable"
+#~ msgstr "Benutzbare Gegenstände"
 
-#~ msgid "pickup"
-#~ msgstr "Aufheben"
+#~ msgid "equip-1hand"
+#~ msgstr "Einhänder"
 
-#, fuzzy
-#~ msgid "pickupchat"
-#~ msgstr "Aufheben"
+#~ msgid "equip-2hand"
+#~ msgstr "Zweihänder"
 
-#, fuzzy
-#~ msgid "pickupparticle"
-#~ msgstr "als Partikeleffekt"
+#~ msgid "equip-arms"
+#~ msgstr "Armausrüstung"
 
-#, fuzzy
-#~ msgid "play"
-#~ msgstr "Los!"
+#~ msgid "equip-head"
+#~ msgstr "Kopfbedeckung"
 
-#~ msgid "player"
-#~ msgstr "Spieler"
+#~ msgid "equip-legs"
+#~ msgstr "Beinausrüstung"
 
-#~ msgid "polearm"
-#~ msgstr "Waffenarm"
+#~ msgid "equip-shield"
+#~ msgstr "Schilde"
 
-#~ msgid "port"
-#~ msgstr "Port:"
+#~ msgid "equip-ring"
+#~ msgstr "Ring"
 
-#~ msgid "present"
-#~ msgstr "Anwesend: "
+#~ msgid "equip-necklace"
+#~ msgstr "Halsketten"
 
-#~ msgid "previous"
-#~ msgstr "Zurück"
+#~ msgid "equip-feet"
+#~ msgstr "Schuhe & Stiefel"
 
-#, fuzzy
-#~ msgid "quit"
-#~ msgstr "Beenden"
+#~ msgid "equip-ammo"
+#~ msgstr "Waffe"
 
-#~ msgid "record"
-#~ msgstr "nehme auf"
+#~ msgid "knife"
+#~ msgstr "Messer"
 
-#~ msgid "register"
-#~ msgstr "Registrieren"
+#~ msgid "sword"
+#~ msgstr "Schwert"
 
-#~ msgid "relation"
-#~ msgstr "Beziehung"
+#~ msgid "polearm"
+#~ msgstr "Waffenarm"
 
-#~ msgid "reset"
-#~ msgstr "Zurücksetzten"
+#~ msgid "staff"
+#~ msgstr "Stab"
 
-#~ msgid "retrieve"
-#~ msgstr "Abholen"
+#~ msgid "whip"
+#~ msgstr "Peitsche"
 
-#, fuzzy
-#~ msgid "screen"
-#~ msgstr "Vollbild"
+#~ msgid "bow"
+#~ msgstr "Bogen"
 
-#, fuzzy
-#~ msgid "screenheight"
-#~ msgstr "Bildschirmfoto"
+#~ msgid "shooting"
+#~ msgstr "schießen"
 
-#~ msgid "screenshot-dir"
-#~ msgstr "Bildschirmfotoordner"
+#~ msgid "mace"
+#~ msgstr "Irrgarten"
 
-#~ msgid "sell"
-#~ msgstr "Verkaufen"
+#~ msgid "axe"
+#~ msgstr "Axt"
 
-#~ msgid "send"
-#~ msgstr "Senden"
+#~ msgid "thrown"
+#~ msgstr "geworfen"
 
-#~ msgid "server"
-#~ msgstr "Server"
+#~ msgid "ItemDB: Error while loading items.xml!"
+#~ msgstr "Fehler beim Laden von item.xml!"
 
-#, fuzzy
-#~ msgid "set"
-#~ msgstr "Zurücksetzten"
+#~ msgid "other"
+#~ msgstr "andere"
 
-#~ msgid "sex"
-#~ msgstr "Geschlecht"
+#~ msgid "weight"
+#~ msgstr "Gewicht:"
 
-#~ msgid "sfxVolume"
-#~ msgstr "Lautstärke der Klangeffekte"
+#~ msgid "view"
+#~ msgstr "Ansicht"
 
-#~ msgid "shooting"
-#~ msgstr "schießen"
+#~ msgid "image"
+#~ msgstr "Bild"
 
-#~ msgid "showownname"
-#~ msgstr "Zeige eigenen Namen"
+#~ msgid "weapon-type"
+#~ msgstr "Waffentyp"
 
-#~ msgid "showpickupchat"
-#~ msgstr "Benachrichtigung beim Aufheben"
+#~ msgid "attack-range"
+#~ msgstr "Angriffsreichweite"
 
-#, fuzzy
-#~ msgid "showpickupparticle"
-#~ msgstr "als Partikeleffekt"
+#~ msgid "effect"
+#~ msgstr "Effekt:"
+
+#~ msgid "particle-effect"
+#~ msgstr "Partikeleffekte"
 
 #, fuzzy
-#~ msgid "skill"
-#~ msgstr "Fertigkeiten"
+#~ msgid "unisex"
+#~ msgstr "benutze"
+
+#~ msgid "male"
+#~ msgstr "Männlich"
+
+#~ msgid "female"
+#~ msgstr "Weiblich"
 
 #, fuzzy
-#~ msgid "skills"
-#~ msgstr "Fertigkeiten"
+#~ msgid "event"
+#~ msgstr "Letzter Server:"
+
+#~ msgid "hit"
+#~ msgstr "getroffen"
+
+#~ msgid "monsters"
+#~ msgstr "Monster"
+
+#~ msgid "monster"
+#~ msgstr "Monster"
 
 #~ msgid "small"
 #~ msgstr "klein"
 
-#~ msgid "sound"
-#~ msgstr "Ton"
+#~ msgid "large"
+#~ msgstr "groß"
 
-#~ msgid "split"
-#~ msgstr "Aufteilen"
+#~ msgid "miss"
+#~ msgstr "verfehlt"
 
-#~ msgid "staff"
-#~ msgstr "Stab"
+#~ msgid "hurt"
+#~ msgstr "verletzten"
 
-#~ msgid "store"
-#~ msgstr "Einlagern"
+#, fuzzy
+#~ msgid "action"
+#~ msgstr "Beziehung"
 
-#~ msgid "sword"
-#~ msgstr "Schwert"
+#~ msgid "particlefx"
+#~ msgstr "als Partikeleffekt"
 
-#~ msgid "talk"
-#~ msgstr "Sprechen"
+#~ msgid "Buddy"
+#~ msgstr "Freund"
 
-#~ msgid "thrown"
-#~ msgstr "geworfen"
+#~ msgid "Buddy List"
+#~ msgstr "Freundesliste"
 
-#, fuzzy
-#~ msgid "toggle"
-#~ msgstr "Logger"
+#~ msgid "Job Level: %d"
+#~ msgstr "Berufsstufe: %d"
 
-#, fuzzy
-#~ msgid "topic"
-#~ msgstr "Stopp"
+#~ msgid "Ok"
+#~ msgstr "Ok"
 
-#~ msgid "trade"
-#~ msgstr "Handeln"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Spruch 1 sprechen"
 
-#~ msgid "type"
-#~ msgstr "Typ: "
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Spruch 2 sprechen"
 
-#~ msgid "unequip"
-#~ msgstr "Ausziehen"
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Spruch 3 sprechen"
 
-#~ msgid "unignore"
-#~ msgstr "nicht ignorieren"
+#~ msgid "2 Handed Weapons"
+#~ msgstr "zweihändige Waffen"
 
-#, fuzzy
-#~ msgid "unisex"
-#~ msgstr "benutze"
+#~ msgid "Failed to switch to "
+#~ msgstr "Konnte Auflösung nicht ändern zu "
 
-#, fuzzy
-#~ msgid "unknown"
-#~ msgstr "Unbekannter Gegenstand"
+#~ msgid "Mystery Skill"
+#~ msgstr "Unbekannter Skill"
 
-#, fuzzy
-#~ msgid "unregister"
-#~ msgstr "Abmelden"
+#~ msgid "Weapons"
+#~ msgstr "Waffen"
 
-#~ msgid "update-host"
-#~ msgstr "Updateserver: "
+#~ msgid "Crafts"
+#~ msgstr "Handwerk"
 
-#, fuzzy
-#~ msgid "updatehost"
-#~ msgstr "Ungültiger Updateserver: "
+#~ msgid "Stats"
+#~ msgstr "Fähigkeiten"
 
-#~ msgid "usable"
-#~ msgstr "Benutzbare Gegenstände"
+#~ msgid "Total"
+#~ msgstr "Gesamt"
 
-#~ msgid "use"
-#~ msgstr "benutze"
+#~ msgid "Cost"
+#~ msgstr "Preis"
 
-#~ msgid "username"
-#~ msgstr "Benutztername"
+#~ msgid "Attack:"
+#~ msgstr "Angriff:"
 
-#, fuzzy
-#~ msgid "users"
-#~ msgstr "benutze"
+#~ msgid "% Reflex:"
+#~ msgstr "% Reaktion:"
 
-#, fuzzy
-#~ msgid "videomode"
-#~ msgstr " Auflösung: "
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Verbleibende Statuspunkte: %d"
 
-#~ msgid "view"
-#~ msgstr "Ansicht"
+#~ msgid "Max level"
+#~ msgstr "Max Level"
 
-#~ msgid "visiblenames"
-#~ msgstr "Sichtbare Namen"
+#~ msgid "curl error "
+#~ msgstr "curl-Fehler "
 
-#, fuzzy
-#~ msgid "vit"
-#~ msgstr "Sitzen"
+#~ msgid "Buddys"
+#~ msgstr "Freunde"
 
-#~ msgid "weapon-type"
-#~ msgstr "Waffentyp"
+#~ msgid "Unarmed"
+#~ msgstr "Unbewaffnet"
 
-#~ msgid "weight"
-#~ msgstr "Gewicht:"
+#~ msgid "Bow"
+#~ msgstr "Bogen"
 
-#~ msgid "where"
-#~ msgstr "Wo"
+#~ msgid "Axe"
+#~ msgstr "Axt"
 
-#~ msgid "whip"
-#~ msgstr "Peitsche"
+#~ msgid "Craft"
+#~ msgstr "Handwerk"
 
-#~ msgid "whisper"
-#~ msgstr "geflüsterte Nachricht"
+#~ msgid "Couldn't set "
+#~ msgstr "Konnte Einstellung nicht setzen: "
 
-#~ msgid "whisper tab"
-#~ msgstr "geflüsterte Nachricht"
+#~ msgid "a"
+#~ msgstr "ein"
 
-#~ msgid "whispertab"
-#~ msgstr "geflüsterte Nachricht"
+#~ msgid "Scroll radius"
+#~ msgstr "Scroll-Radius"
 
-#~ msgid "who"
-#~ msgstr "Wer"
+#~ msgid "Scroll laziness"
+#~ msgstr "Scroll-Trägheit"
 
-#, fuzzy
-#~ msgid "will"
-#~ msgstr "Fertigkeiten"
+#~ msgid "Save player list"
+#~ msgstr "Spielerliste sichern"
 
-#, fuzzy
-#~ msgid "world"
-#~ msgstr "Schwertpolarm"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "Konnte selection.png nicht laden"
 
-#~ msgid "yes"
-#~ msgstr "Ja"
+#~ msgid " cancelled"
+#~ msgstr " abgebrochen"
+
+#~ msgid "  -D --default    : Bypass the login process with default settings"
+#~ msgstr "  -D --default : Ãœberspringe die Anmeldung mit den Voreinstellungen"
+
+#~ msgid "NPC Number Request"
+#~ msgstr "NPC Nummer Anfrage"
+
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr ""
+#~ "\n"
+#~ "> Abbrechen\n"
+
+#~ msgid "NPC Text Request"
+#~ msgstr "NPC text Anfrage"
+
+#~ msgid "Slots: "
+#~ msgstr "Plätze: "
+
+#~ msgid "Emote Window"
+#~ msgstr "Gefühlsfenster"
diff --git a/po/en_GB.po b/po/en_GB.po
index bbdcda57..b43b85da 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-03-04 21:01+0000\n"
 "Last-Translator: issyl0 <isabell121@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -19,414 +19,355 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/npcdialog.cpp:183
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Next"
-
-#: ../src/main.cpp:60
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl   : Disable OpenGL for this session"
-
-#: ../src/main.cpp:58
-#, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir    : Directory to use as home directory"
-
-#: ../src/main.cpp:52
-#, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Use this update host"
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Setup"
 
-#: ../src/main.cpp:46
+#: src/client.cpp:679
 #, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Configuration file to use"
+msgid "Connecting to server"
+msgstr "Connecting to map server..."
 
-#: ../src/main.cpp:53
+#: src/client.cpp:706
 #, fuzzy
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default     : Choose default character server and character"
+msgid "Logging in"
+msgstr "Login"
 
-#: ../src/main.cpp:57
-#, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir    : Directory to use as home directory"
+#: src/client.cpp:739
+msgid "Entering game world"
+msgstr ""
 
-#: ../src/main.cpp:48
+#: src/client.cpp:804
 #, fuzzy
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password    : Login with this password"
+msgid "Requesting characters"
+msgstr "Select Character"
 
-#: ../src/main.cpp:47
+#: src/client.cpp:833
 #, fuzzy
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username    : Login with this username"
+msgid "Connecting to the game server"
+msgstr "Connecting to map server..."
 
-#: ../src/main.cpp:49
+#: src/client.cpp:843
 #, fuzzy
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character   : Login with this character"
+msgid "Changing game servers"
+msgstr "Server"
 
-#: ../src/main.cpp:56
-#, fuzzy
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data        : Directory to load game data from"
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Error"
 
-#: ../src/main.cpp:45
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help        : Display this help"
+#: src/client.cpp:888
+msgid "Requesting registration details"
+msgstr ""
 
-#: ../src/main.cpp:51
+#: src/client.cpp:915
 #, fuzzy
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port        : Login server port"
+msgid "Password Change"
+msgstr "Password:"
 
-#: ../src/main.cpp:50
-#, fuzzy
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server      : Login server name or IP"
+#: src/client.cpp:916
+msgid "Password changed successfully!"
+msgstr ""
 
-#: ../src/main.cpp:55
+#: src/client.cpp:935
 #, fuzzy
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Skip the update downloads"
+msgid "Email Change"
+msgstr "Change"
 
-#: ../src/main.cpp:44
+#: src/client.cpp:936
 #, fuzzy
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version     : Display the version"
-
-#: ../src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1  It is strongly recommended that"
-
-#: ../src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1  The update process is incomplete."
+msgid "Email changed successfully!"
+msgstr "Member was promoted successfully."
 
-#: ../src/gui/updatewindow.cpp:421
+#: src/client.cpp:956
 #, fuzzy
-msgid "##1  you try again later."
-msgstr "##1  you try again later"
-
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Accuracy:"
-
-#: ../src/net/tmwa/generalhandler.cpp:230
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "Critical Hit"
-
-#: ../src/net/tmwa/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% Evade:"
-
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr ""
+msgid "Unregister Successful"
+msgstr "Unregister"
 
-#: ../src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
+#: src/client.cpp:957
+msgid "Farewell, come back any time..."
 msgstr ""
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:291
+#: src/client.cpp:1281
 #, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s joined the party."
-
-#: ../src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s has invited you to join the %s party."
+msgid "Invalid update host: %s"
+msgstr "Invalid update host: "
 
-#: ../src/gui/socialwindow.cpp:561
-#, fuzzy, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s has invited you to join the %s party."
+#: src/client.cpp:1315 src/client.cpp:1321
+msgid "Error creating updates directory!"
+msgstr "Error creating updates directory!"
 
-#: ../src/gui/socialwindow.cpp:600
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s has invited you to join their party."
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
+msgid "Unknown command."
+msgstr "Unknown command."
 
-#: ../src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#: src/commandhandler.cpp:160
+msgid "-- Help --"
+msgstr "-- Help --"
 
-#: ../src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s has left your party."
+#: src/commandhandler.cpp:161
+msgid "/help > Display this help"
+msgstr "/help > Display this help"
 
-#: ../src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#: src/commandhandler.cpp:163
+msgid "/where > Display map name"
+msgstr "/where > Display map name"
 
-#: ../src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s is already a member of a party."
+#: src/commandhandler.cpp:164
+msgid "/who > Display number of online users"
+msgstr "/who > Display number of online users"
 
-#: ../src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s is not in your party!"
+#: src/commandhandler.cpp:165
+msgid "/me > Tell something about yourself"
+msgstr "/me > Tell something about yourself"
 
-#: ../src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s is now a member of your party."
+#: src/commandhandler.cpp:167
+msgid "/clear > Clears this window"
+msgstr "/clear > Clears this window"
 
-#: ../src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s joined the party."
+#: src/commandhandler.cpp:169
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Send a private message to a user"
 
-#: ../src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
+#: src/commandhandler.cpp:170
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Alias of msg"
 
-#: ../src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s refused your invitation."
+#: src/commandhandler.cpp:171
+msgid "/w > Alias of msg"
+msgstr "/w > Alias of msg"
 
-#: ../src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s refused your invitation."
+#: src/commandhandler.cpp:172
+msgid "/query > Makes a tab for private messages with another user"
+msgstr "/query > Makes a tab for private messages with another user"
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s wants to trade with you, do you accept?"
+#: src/commandhandler.cpp:174
+msgid "/q > Alias of query"
+msgstr "/q > Alias of query"
 
-#: ../src/gui/widgets/chattab.cpp:152
-#, fuzzy, c-format
-msgid "%s whispers: %s"
-msgstr "%s whispers: "
+#: src/commandhandler.cpp:176
+msgid "/ignore > ignore a player"
+msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
-msgid "(empty)"
+#: src/commandhandler.cpp:177
+msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: ../src/commandhandler.cpp:222
-msgid "*** only available to a GM ***"
-msgstr "*** only available to a GM ***"
+#: src/commandhandler.cpp:179
+msgid "/list > Display all public channels"
+msgstr "/list > Display all public channels"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
-msgid "+"
-msgstr ""
+#: src/commandhandler.cpp:180
+msgid "/join > Join or create a channel"
+msgstr "/join > Join or create a channel"
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
-msgid "-"
-msgstr ""
+#: src/commandhandler.cpp:182
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Create a new party"
 
-#: ../src/commandhandler.cpp:166
-msgid "-- Help --"
-msgstr "-- Help --"
+#: src/commandhandler.cpp:183
+msgid "/party > Invite a user to party"
+msgstr "/party > Invite a user to party"
+
+#: src/commandhandler.cpp:185
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Start recording the chat to an external file"
 
-#: ../src/commandhandler.cpp:201
+#: src/commandhandler.cpp:187
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr "/toggle > Determine whether <return> toggles the chat log"
+
+#: src/commandhandler.cpp:189
+msgid "/present > Get list of players present (sent to chat log, if logging)"
+msgstr "/present > Get list of players present (sent to chat log, if logging)"
+
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Global announcement (GM only)"
 
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
+#: src/commandhandler.cpp:196
+msgid "For more information, type /help <command>."
+msgstr "For more information, type /help <command>."
 
-#: ../src/commandhandler.cpp:173
-msgid "/clear > Clears this window"
-msgstr "/clear > Clears this window"
+#: src/commandhandler.cpp:200
+msgid "Command: /help"
+msgstr "Command: /help"
 
-#: ../src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Close the whisper tab"
+#: src/commandhandler.cpp:201
+msgid "This command displays a list of all commands available."
+msgstr "This command displays a list of all commands available."
 
-#: ../src/commandhandler.cpp:191
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Create a new party"
+#: src/commandhandler.cpp:203
+msgid "Command: /help <command>"
+msgstr "Command: /help <command>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Show/change party experience sharing options"
+#: src/commandhandler.cpp:204
+msgid "This command displays help on <command>."
+msgstr "This command displays help on <command>."
 
-#: ../src/commandhandler.cpp:167
-msgid "/help > Display this help"
-msgstr "/help > Display this help"
+#: src/commandhandler.cpp:212
+msgid "Command: /announce <msg>"
+msgstr "Command: /announce <msg>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Display this help."
+#: src/commandhandler.cpp:213
+msgid "*** only available to a GM ***"
+msgstr "*** only available to a GM ***"
 
-#: ../src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
-msgstr ""
+#: src/commandhandler.cpp:214
+msgid "This command sends the message <msg> to all players currently online."
+msgstr "This command sends the message <msg> to all players currently online."
 
-#: ../src/commandhandler.cpp:185
-msgid "/ignore > ignore a player"
-msgstr ""
+#: src/commandhandler.cpp:219
+msgid "Command: /clear"
+msgstr "Command: /clear"
+
+#: src/commandhandler.cpp:220
+msgid "This command clears the chat log of previous chat."
+msgstr "This command clears the chat log of previous chat."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
+#: src/commandhandler.cpp:224
 #, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invite a player to your party"
+msgid "Command: /ignore <player>"
+msgstr "Command: /item <policy>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Invite a player to your party"
+#: src/commandhandler.cpp:225
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "This command displays the number of players currently online."
 
-#: ../src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > Show/change party item sharing options"
+#: src/commandhandler.cpp:230
+msgid "Command: /join <channel>"
+msgstr "Command: /join <channel>"
 
-#: ../src/commandhandler.cpp:189
-msgid "/join > Join or create a channel"
-msgstr "/join > Join or create a channel"
+#: src/commandhandler.cpp:231
+msgid "This command makes you enter <channel>."
+msgstr "This command makes you enter <channel>."
 
-#: ../src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Kick a user from the channel"
+#: src/commandhandler.cpp:232
+msgid "If <channel> doesn't exist, it's created."
+msgstr "If <channel> doesn't exist, it's created."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
-#, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Kick some one from the party you are in"
+#: src/commandhandler.cpp:236
+msgid "Command: /list"
+msgstr "Command: /list"
 
-#: ../src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Kick some one from the party you are in"
+#: src/commandhandler.cpp:237
+msgid "This command shows a list of all channels."
+msgstr "This command shows a list of all channels."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
-#, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Leave the party you are in"
+#: src/commandhandler.cpp:241
+msgid "Command: /me <message>"
+msgstr "Command: /me <message>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Leave the party you are in"
+#: src/commandhandler.cpp:242
+msgid "This command tell others you are (doing) <msg>."
+msgstr "This command tell others you are (doing) <msg>."
 
-#: ../src/commandhandler.cpp:188
-msgid "/list > Display all public channels"
-msgstr "/list > Display all public channels"
+#: src/commandhandler.cpp:246
+msgid "Command: /msg <nick> <message>"
+msgstr "Command: /msg <nick> <message>"
 
-#: ../src/commandhandler.cpp:171
-msgid "/me > Tell something about yourself"
-msgstr "/me > Tell something about yourself"
+#: src/commandhandler.cpp:247
+msgid "Command: /whisper <nick> <message>"
+msgstr "Command: /whisper <nick> <message>"
 
-#: ../src/commandhandler.cpp:175
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Send a private message to a user"
+#: src/commandhandler.cpp:248
+msgid "Command: /w <nick> <message>"
+msgstr "Command: /w <nick> <message>"
 
-#: ../src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Make a user a channel operator"
+#: src/commandhandler.cpp:249
+msgid "This command sends the text <message> to <nick>."
+msgstr "This command sends the text <message> to <nick>."
 
-#: ../src/commandhandler.cpp:192
-msgid "/party > Invite a user to party"
-msgstr "/party > Invite a user to party"
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "If the <nick> has spaces in it, enclose it in double quotes (\")."
 
-#: ../src/commandhandler.cpp:198
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:255
+msgid "Command: /query <nick>"
+msgstr "Command: /query <nick>"
 
-#: ../src/commandhandler.cpp:180
-msgid "/q > Alias of query"
-msgstr "/q > Alias of query"
+#: src/commandhandler.cpp:256
+msgid "Command: /q <nick>"
+msgstr "Command: /q <nick>"
 
-#: ../src/commandhandler.cpp:178
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Makes a tab for private messages with another user"
+#: src/commandhandler.cpp:257
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+msgstr "This command tries to make a tab for whispers between you and <nick>."
 
-#: ../src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Leave a channel"
+#: src/commandhandler.cpp:262
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Command: /create <party-name>"
 
-#: ../src/commandhandler.cpp:194
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Start recording the chat to an external file"
+#: src/commandhandler.cpp:263
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "These commands create a new party called <party-name>."
 
-#: ../src/commandhandler.cpp:196
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:267
+msgid "Command: /party <nick>"
+msgstr "Command: /party <nick>"
 
-#: ../src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Set the topic of the current channel"
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "This command invites <nick> to party with you."
 
-#: ../src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+#: src/commandhandler.cpp:274
+msgid "Command: /present"
+msgstr "Command: /present"
 
-#: ../src/commandhandler.cpp:186
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:275
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
 msgstr ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
 
-#: ../src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Lists the users in the current channel"
-
-#: ../src/commandhandler.cpp:177
-msgid "/w > Alias of msg"
-msgstr "/w > Alias of msg"
-
-#: ../src/commandhandler.cpp:169
-msgid "/where > Display map name"
-msgstr "/where > Display map name"
+#: src/commandhandler.cpp:281
+msgid "Command: /record <filename>"
+msgstr "Command: /record <filename>"
 
-#: ../src/commandhandler.cpp:176
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias of msg"
+#: src/commandhandler.cpp:282
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr "This command starts recording the chat log to the file <filename>."
 
-#: ../src/commandhandler.cpp:170
-msgid "/who > Display number of online users"
-msgstr "/who > Display number of online users"
+#: src/commandhandler.cpp:284
+msgid "Command: /record"
+msgstr "Command: /record"
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr ""
+#: src/commandhandler.cpp:285
+msgid "This command finishes a recording session."
+msgstr "This command finishes a recording session."
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+#: src/commandhandler.cpp:289
+msgid "Command: /toggle <state>"
+msgstr "Command: /toggle <state>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/commandhandler.cpp:290
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -434,3503 +375,3435 @@ msgstr ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ""
+#: src/commandhandler.cpp:295
+msgid "Command: /toggle"
+msgstr "Command: /toggle"
 
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: src/commandhandler.cpp:296
+msgid "This command displays the return toggle status."
+msgstr "This command displays the return toggle status."
 
-#: ../src/gui/socialwindow.cpp:566
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
-msgid "Accept Guild Invite"
-msgstr "Accept Party Invite"
+msgid "Command: /unignore <player>"
+msgstr "Command: /item <policy>"
 
-#: ../src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Accept Party Invite"
+#: src/commandhandler.cpp:301
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:466
-#, fuzzy, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Accepted invite from %s."
+#: src/commandhandler.cpp:306
+msgid "Command: /where"
+msgstr "Command: /where"
 
-#: ../src/gui/socialwindow.cpp:447
-#, fuzzy, c-format
-msgid "Accepted party invite from %s."
-msgstr "Accepted invite from %s."
+#: src/commandhandler.cpp:307
+msgid "This command displays the name of the current map."
+msgstr "This command displays the name of the current map."
 
-#: ../src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Accepting incoming trade requests"
+#: src/commandhandler.cpp:311
+msgid "Command: /who"
+msgstr "Command: /who"
 
-#: ../src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Accepting incoming trade requests."
+#: src/commandhandler.cpp:312
+msgid "This command displays the number of players currently online."
+msgstr "This command displays the number of players currently online."
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
+#: src/commandhandler.cpp:318
+msgid "Type /help for a list of commands."
+msgstr "Type /help for a list of commands."
+
+#: src/commandhandler.cpp:384
+msgid "Cannot send empty whispers!"
+msgstr "Cannot send empty whispers!"
+
+#: src/commandhandler.cpp:392
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 
-#: ../src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Account and Character Management"
+#: src/commandhandler.cpp:406
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Requesting to join channel %s."
 
-#: ../src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Account banned"
-msgstr "Account expired"
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Party name is missing."
 
-#: ../src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Account banned."
-msgstr "Account expired"
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
+msgid "Please specify a name."
+msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:162
-#, fuzzy
-msgid "Account expired."
-msgstr "Account expired"
+#: src/commandhandler.cpp:450
+msgid "Return toggles chat."
+msgstr "Return toggles chat."
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Account not connected. Please login first."
+#: src/commandhandler.cpp:450
+msgid "Message closes chat."
+msgstr "Message closes chat."
 
-#: ../src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Account was not found. Please re-login."
+#: src/commandhandler.cpp:459
+msgid "Return now toggles chat."
+msgstr "Return now toggles chat."
 
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
-msgstr "Account: %s"
+#: src/commandhandler.cpp:463
+msgid "Message now closes chat."
+msgstr "Message now closes chat."
 
-#: ../src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Add"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:171
-#, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|Add name to chat@@"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
+msgid "Player already ignored!"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
+#: src/commandhandler.cpp:522
 #, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Add to chat@@"
+msgid "Player successfully ignored!"
+msgstr "Party successfully created."
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Agility"
+#: src/commandhandler.cpp:524
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "Whisper could not be sent, ignored by user."
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "Agility %+d"
+#: src/commandhandler.cpp:539
+msgid "Player wasn't ignored!"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Agility:"
+#: src/commandhandler.cpp:544
+msgid "Player no longer ignored!"
+msgstr ""
 
-#: ../src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Agree trade"
+#: src/commandhandler.cpp:546
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "Whisper could not be sent, ignored by user."
 
-#: ../src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Agreed. Waiting..."
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: ../src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "All"
+#: src/game.cpp:172
+msgid "General"
+msgstr "General"
 
-#: ../src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Allow trading"
+#: src/game.cpp:342
+#, fuzzy
+msgid "Screenshot saved as "
+msgstr "Screenshot saved to ~/"
 
-#: ../src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Allow whispers"
+#: src/game.cpp:347
+msgid "Saving screenshot failed!"
+msgstr "Saving screenshot failed!"
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
+#: src/game.cpp:378
 #, fuzzy
-msgid "Already logged in."
-msgstr "Already logged in"
+msgid "The connection to the server was lost."
+msgstr "The connection to the server was lost, the program will now quit."
 
-#: ../src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Already recording."
+#: src/game.cpp:382
+msgid "Network Error"
+msgstr "Network Error"
 
-#: ../src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Ambient FX"
+#: src/game.cpp:721
+msgid "Ignoring incoming trade requests"
+msgstr "Ignoring incoming trade requests"
 
-#: ../src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "Ambient FX"
+#: src/game.cpp:726
+msgid "Accepting incoming trade requests"
+msgstr "Accepting incoming trade requests"
+
+#: src/game.cpp:954
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Could not load map"
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/game.cpp:955
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "An unknown member tried to say: %s"
+msgid "Error while loading %s"
+msgstr "Error while loading %s"
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Annihilated."
+#: src/gui/beingpopup.cpp:76
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Party (%s)"
 
-#: ../src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Apply"
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Buy"
 
-#: ../src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr "Applying change to OpenGL requires restart."
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Price: %s / Total: %s"
 
-#: ../src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
+msgid "+"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Are you sure you want to delete this character?"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
+msgid "-"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:168
-#, fuzzy, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Are you sure you want to quit?"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Exit"
 
-#: ../src/gui/socialwindow.cpp:247
-#, fuzzy, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Are you sure you want to quit?"
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
+msgid "Max"
+msgstr "Max"
 
-#: ../src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Assign"
+#: src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Shop"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Attack"
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Sell"
+
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Cancel"
+
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Change Email Address"
 
-#: ../src/resources/itemdb.cpp:53
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
-msgid "Attack %+d"
-msgstr "Attack %+d"
+msgid "Account: %s"
+msgstr "Account: %s"
+
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
+msgstr "Type new email address twice:"
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: src/gui/changeemaildialog.cpp:127
 #, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Attack %+d"
+msgid "The new email address needs to be at least %d characters long."
+msgstr "The username needs to be at least %d characters long."
 
-#: ../src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "Attendance written to record log."
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "The username needs to be less than %d characters long."
 
-#: ../src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Audio"
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "The new Email Address already exists."
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
+msgid "Change Password"
+msgstr "Change Password"
+
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Password:"
 
-#: ../src/net/tmwa/generalhandler.cpp:129
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
-msgid "Authentication failed."
-msgstr "Authentication failed"
+msgid "Type new password twice:"
+msgstr "Type new password twice:"
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:100
+#: src/gui/changepassworddialog.cpp:116
 #, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|Befriend %s@@"
+msgid "The new password needs to be at least %d characters long."
+msgstr "The password needs to be at least %d characters long."
 
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Being"
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "The password needs to be less than %d characters long."
 
-#: ../src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Bereft of life, you rest in peace."
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
 
-#: ../src/playerrelations.cpp:342
-msgid "Blink name"
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Create Character"
+
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Name:"
+
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:138
-#, fuzzy
-msgid "Blue:"
-msgstr "Blue: "
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Bubbles with names"
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
+msgstr "Hair Colour:"
 
-#: ../src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Bubbles, no names"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
+msgstr "Hair Style:"
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Buy"
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
+msgid "Create"
+msgstr "Create"
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Calibrate"
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "Male"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Cancel"
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "Female"
 
-#: ../src/commandhandler.cpp:422
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "Please distribute %d points"
+msgstr "Please distribute %d points"
 
-#: ../src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "Your name needs to be at least 4 characters."
 
-#: ../src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
+msgstr "Character stats OK"
 
-#: ../src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "Cannot send empty chat!"
+#: src/gui/charcreatedialog.cpp:256
+#, c-format
+msgid "Please remove %d points"
+msgstr "Please remove %d points"
 
-#: ../src/commandhandler.cpp:401
-msgid "Cannot send empty whispers!"
-msgstr "Cannot send empty whispers!"
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Confirm Character Delete"
 
-#: ../src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Can not shout!"
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "Are you sure you want to delete this character?"
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "Cannot use this ID"
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr "Account and Character Management"
 
-#: ../src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Change"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Unregister"
 
-#: ../src/gui/charselectdialog.cpp:150
+#: src/gui/charselectdialog.cpp:150
 #, fuzzy
 msgid "Change Email"
 msgstr "Change Email Address"
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Change Email Address"
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Delete"
 
-#: ../src/gui/worldselectdialog.cpp:76
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
-msgid "Change Login"
-msgstr "Change"
+msgid "Choose"
+msgstr "Close"
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Change Password"
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
+msgid "(empty)"
+msgstr ""
 
-#: ../src/gui/login.cpp:62
-#, fuzzy
-msgid "Change Server"
-msgstr "Server"
+#: src/gui/chat.cpp:88
+msgid "Chat"
+msgstr "Chat"
 
-#: ../src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "Changes will take effect on map change."
+#: src/gui/chat.cpp:311
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
+msgstr "%d players are present."
 
-#: ../src/client.cpp:813
-#, fuzzy
-msgid "Changing game servers"
-msgstr "Server"
+#: src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Attendance written to record log."
 
-#: ../src/gui/setup_video.cpp:460
-#, fuzzy
-msgid "Changing to OpenGL"
-msgstr "Changing OpenGL"
+#: src/gui/chat.cpp:493
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Whispering to %s: %s"
 
-#: ../src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
-msgstr "Channel operators can kick and op other users from the channel."
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Yes"
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "Channels are not supported!"
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "No"
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Character deleted."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: ../src/gui/statuswindow.cpp:238
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
 #, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Character stats OK"
+msgid "Music: %s"
+msgstr "Topic: %s"
 
-#: ../src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Character stats OK"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Name: %s"
 
-#: ../src/net/manaserv/charhandler.cpp:143
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Username already exists"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "MiniMap"
 
-#: ../src/net/manaserv/charhandler.cpp:155
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Character stats OK"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:158
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Character stats OK"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Particle Effects"
 
-#: ../src/gui/chat.cpp:87
-msgid "Chat"
-msgstr "Chat"
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Particle Detail"
 
-#: ../src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Chat Window"
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Ambient FX"
 
-#: ../src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Failed to create channel!"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Equipment"
 
-#: ../src/gui/charselectdialog.cpp:380
-#, fuzzy
-msgid "Choose"
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
+msgid "Unequip"
+msgstr "Unequip"
+
+#: src/gui/help.cpp:37
+msgid "Help"
+msgstr "Help"
+
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
+msgid "Close"
 msgstr "Close"
 
-#: ../src/gui/worldselectdialog.cpp:77
-#, fuzzy
-msgid "Choose World"
-msgstr "Choose your server"
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inventory"
 
-#: ../src/gui/serverdialog.cpp:196
-#, fuzzy
-msgid "Choose Your Server"
-msgstr "Choose your server"
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Storage"
 
-#: ../src/gui/socialwindow.cpp:544
-#, fuzzy
-msgid "Choose your guild's name."
-msgstr "Choose your server"
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Slots:"
 
-#: ../src/gui/socialwindow.cpp:630
-#, fuzzy
-msgid "Choose your party's name."
-msgstr "Choose your server"
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
+msgid "Equip"
+msgstr "Equip"
 
-#: ../src/gui/npcdialog.cpp:98
-msgid "Clear log"
-msgstr ""
+#: src/gui/inventorywindow.cpp:88
+msgid "Use"
+msgstr "Use"
 
-#: ../src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Client version is too old"
-
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
-msgid "Close"
-msgstr "Close"
+msgid "Drop..."
+msgstr "Drop"
 
-#: ../src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Colours"
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
+msgid "Split"
+msgstr "Split"
 
-#: ../src/commandhandler.cpp:221
-msgid "Command: /announce <msg>"
-msgstr "Command: /announce <msg>"
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
 
-#: ../src/commandhandler.cpp:274
-#, fuzzy
-msgid "Command: /away"
-msgstr "Command: /who"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
+msgstr "Weight:"
 
-#: ../src/commandhandler.cpp:271
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Command: /w <nick> <message>"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Store"
 
-#: ../src/commandhandler.cpp:228
-msgid "Command: /clear"
-msgstr "Command: /clear"
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Retrieve"
 
-#: ../src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Command: /close"
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
+msgid "Drop"
+msgstr "Drop"
 
-#: ../src/commandhandler.cpp:279
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Command: /create <party-name>"
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
+msgid "OK"
+msgstr "OK"
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Command: /exp"
+#: src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "All"
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Command: /exp <policy>"
+#: src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Select amount of items to trade."
 
-#: ../src/commandhandler.cpp:209
-msgid "Command: /help"
-msgstr "Command: /help"
+#: src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Select amount of items to drop."
 
-#: ../src/commandhandler.cpp:212
-msgid "Command: /help <command>"
-msgstr "Command: /help <command>"
+#: src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Select amount of items to store."
 
-#: ../src/gui/widgets/whispertab.cpp:88
-#, fuzzy
-msgid "Command: /ignore"
-msgstr "Command: /item"
+#: src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Select amount of items to retrieve."
 
-#: ../src/commandhandler.cpp:233
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Command: /item <policy>"
+#: src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Select amount of items to split."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Command: /invite <nick>"
+#: src/gui/itempopup.cpp:137
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Weight: "
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Command: /item"
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
+msgid "Login"
+msgstr "Login"
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Command: /item <policy>"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Remember username"
+msgstr "Remember Username"
 
-#: ../src/commandhandler.cpp:239
-msgid "Command: /join <channel>"
-msgstr "Command: /join <channel>"
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "Register"
 
-#: ../src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Command: /kick <nick>"
+#: src/gui/login.cpp:62
+#, fuzzy
+msgid "Change Server"
+msgstr "Server"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Command: /leave"
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Item sharing disabled."
 
-#: ../src/commandhandler.cpp:245
-msgid "Command: /list"
-msgstr "Command: /list"
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
 
-#: ../src/commandhandler.cpp:250
-msgid "Command: /me <message>"
-msgstr "Command: /me <message>"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Map"
 
-#: ../src/commandhandler.cpp:255
-msgid "Command: /msg <nick> <message>"
-msgstr "Command: /msg <nick> <message>"
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Command: /op <nick>"
+#: src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Waiting for server"
 
-#: ../src/commandhandler.cpp:284
-msgid "Command: /party <nick>"
-msgstr "Command: /party <nick>"
+#: src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Next"
 
-#: ../src/commandhandler.cpp:291
-msgid "Command: /present"
-msgstr "Command: /present"
+#: src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Submit"
 
-#: ../src/commandhandler.cpp:265
-msgid "Command: /q <nick>"
-msgstr "Command: /q <nick>"
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: ../src/commandhandler.cpp:264
-msgid "Command: /query <nick>"
-msgstr "Command: /query <nick>"
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Command: /quit"
+#: src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Reset"
 
-#: ../src/commandhandler.cpp:301
-msgid "Command: /record"
-msgstr "Command: /record"
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:208
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Next"
 
-#: ../src/commandhandler.cpp:298
-msgid "Command: /record <filename>"
-msgstr "Command: /record <filename>"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "To:"
 
-#: ../src/commandhandler.cpp:312
-msgid "Command: /toggle"
-msgstr "Command: /toggle"
+#: src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Send"
 
-#: ../src/commandhandler.cpp:306
-msgid "Command: /toggle <state>"
-msgstr "Command: /toggle <state>"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Failed to send as sender or letter invalid."
 
-#: ../src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Command: /topic <message>"
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
+#: src/gui/outfitwindow.cpp:70
 #, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Command: /item <policy>"
+msgid "Unequip first"
+msgstr "Unequip"
 
-#: ../src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Command: /users"
+#: src/gui/popupmenu.cpp:83
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Trading with %s"
 
-#: ../src/commandhandler.cpp:257
-msgid "Command: /w <nick> <message>"
-msgstr "Command: /w <nick> <message>"
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Attack %+d"
 
-#: ../src/commandhandler.cpp:323
-msgid "Command: /where"
-msgstr "Command: /where"
+#: src/gui/popupmenu.cpp:91
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Whisper"
 
-#: ../src/commandhandler.cpp:256
-msgid "Command: /whisper <nick> <message>"
-msgstr "Command: /whisper <nick> <message>"
+#: src/gui/popupmenu.cpp:100
+#, fuzzy, c-format
+msgid "Befriend %s"
+msgstr "@@friend|Befriend %s@@"
 
-#: ../src/commandhandler.cpp:328
-msgid "Command: /who"
-msgstr "Command: /who"
+#: src/gui/popupmenu.cpp:105
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Disregarded"
 
-#: ../src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Completed"
+#: src/gui/popupmenu.cpp:108
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Ignored"
 
-#: ../src/playerrelations.cpp:312
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Completely ignore %s@@"
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:117
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Completely ignore %s@@"
 
-#: ../src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Confirm Character Delete"
-
-#: ../src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Confirm:"
-
-#: ../src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Confirmed. Waiting..."
+#: src/gui/popupmenu.cpp:130
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
+msgstr "@@guild|Invite %s to join your guild@@"
 
-#: ../src/keyboardconfig.cpp:184
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr "Resolve them, or gameplay may result in strange behaviour."
+msgid "Invite %s to join your party"
+msgstr "@@party|Invite %s to join your party@@"
 
-#: ../src/gui/serverdialog.cpp:233
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
-msgid "Connect"
-msgstr "Connecting..."
+msgid "Kick player"
+msgstr "Kick failed!"
 
-#: ../src/client.cpp:655
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Connecting to map server..."
+#: src/gui/popupmenu.cpp:150
+#, fuzzy, c-format
+msgid "Talk to %s"
+msgstr "@@talk|Talk To %s@@"
 
-#: ../src/client.cpp:803
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
-msgid "Connecting to the game server"
-msgstr "Connecting to map server..."
-
-#: ../src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Connecting..."
+msgid "Kick monster"
+msgstr "@@admin-kick|Kick monster@@"
 
-#: ../src/net/tmwa/network.cpp:414
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Connecting to map server..."
-
-#: ../src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr ""
+msgid "Add name to chat"
+msgstr "@@name|Add name to chat@@"
 
-#: ../src/gui/statuswindow.cpp:244
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Skill points: %d"
+msgid "Pick up %s"
+msgstr "Pick up"
 
-#: ../src/game.cpp:950
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
-msgid "Could Not Load Map"
-msgstr "Could not load map"
+msgid "Add to chat"
+msgstr "@@chat|Add to chat@@"
 
-#: ../src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "Could not create party."
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Switch server"
 
-#: ../src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
-msgstr ""
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Switch character"
 
-#: ../src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Could not join party!"
+#: src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Finishing recording."
 
-#: ../src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "Could not steal anything..."
+#: src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Not currently recording."
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Create"
+#: src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Already recording."
 
-#: ../src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Create Character"
+#: src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Starting to record..."
 
-#: ../src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Create Guild"
+#: src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Failed to start recording."
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
-#, fuzzy
-msgid "Create Party"
-msgstr "Create Character"
+#: src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Recording…"
 
-#: ../src/gui/socialwindow.cpp:507
-#, fuzzy, c-format
-msgid "Creating guild called %s."
-msgstr "Error creating guild."
+#: src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Stop recording"
 
-#: ../src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Confirm:"
 
-#: ../src/gui/socialwindow.cpp:529
+#: src/gui/register.cpp:100
+msgid "Email:"
+msgstr "Email:"
+
+#: src/gui/register.cpp:166
 #, c-format
-msgid "Creating party called %s."
-msgstr ""
+msgid "The username needs to be at least %d characters long."
+msgstr "The username needs to be at least %d characters long."
 
-#: ../src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "The username needs to be less than %d characters long."
 
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Critical Hit"
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "The password needs to be at least %d characters long."
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+msgid "The password needs to be less than %d characters long."
+msgstr "The password needs to be less than %d characters long."
 
-#: ../src/gui/serverdialog.cpp:234
-#, fuzzy
-msgid "Custom Server"
-msgstr "Custom cursor"
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Passwords do not match."
 
-#: ../src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "Custom cursor"
+#: src/gui/serverdialog.cpp:197
+#, fuzzy
+msgid "Choose Your Server"
+msgstr "Choose your server"
 
-#: ../src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
-msgstr ""
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Server:"
 
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr ""
+#: src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Port:"
 
-#: ../src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Debug Window"
+#: src/gui/serverdialog.cpp:208
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
 
-#: ../src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Default"
+#: src/gui/serverdialog.cpp:229
+#, fuzzy
+msgid "Connect"
+msgstr "Connecting..."
 
-#: ../src/net/tmwa/generalhandler.cpp:225
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
-msgid "Defense"
-msgstr "Defense:"
+msgid "Custom Server"
+msgstr "Custom cursor"
+
+#: src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Please type both the address and the port of a server."
 
-#: ../src/resources/itemdb.cpp:54
+#: src/gui/serverdialog.cpp:441
 #, c-format
-msgid "Defense %+d"
-msgstr "Defense %+d"
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:93
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
-msgid "Delay:"
-msgstr "Delay: "
+msgid "Waiting for server..."
+msgstr "Waiting for server"
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Delete"
+#: src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Dexterity"
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Dexterity %+d"
+msgid "requires v%s"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Dexterity:"
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Sound"
 
-#: ../src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:105
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "Disregarded"
+#: src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Audio"
 
-#: ../src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Disregarded"
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Sfx volume"
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Do you want your possessions identified?"
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Music volume"
 
-#: ../src/gui/setup_audio.cpp:43
-msgid "Download music"
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "No text"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:442
-#, c-format
-msgid "Downloading server list...%2.2f%%"
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
-msgid "Drop"
-msgstr "Drop"
+#: src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "This is what the colour looks like"
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
-#, fuzzy
-msgid "Drop..."
-msgstr "Drop"
+#: src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Colours"
 
-#: ../src/net/tmwa/generalhandler.cpp:145
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
-msgid "Duplicated login."
-msgstr "Duplicated login"
+msgid "Type:"
+msgstr "Type: "
 
-#: ../src/client.cpp:905
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Static"
+
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Pulse"
+
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Rainbow"
+
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Spectrum"
+
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
-msgid "Email Change"
-msgstr "Change"
+msgid "Delay:"
+msgstr "Delay: "
 
-#: ../src/net/manaserv/loginhandler.cpp:309
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Email address already exists"
+msgid "Red:"
+msgstr "Red: "
 
-#: ../src/client.cpp:906
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
-msgid "Email changed successfully!"
-msgstr "Member was promoted successfully."
+msgid "Green:"
+msgstr "Green: "
 
-#: ../src/gui/register.cpp:100
-msgid "Email:"
-msgstr "Email:"
+#: src/gui/setup_colors.cpp:139
+#, fuzzy
+msgid "Blue:"
+msgstr "Blue: "
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Emote Shortcut %d"
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Apply"
 
-#: ../src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr "Emote Shortcut Window"
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Reset Windows"
 
-#: ../src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Emote failed!"
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Press the button to start calibration"
 
-#: ../src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Calibrate"
 
-#: ../src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr "Enable joystick"
 
-#: ../src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Allow/Disallow Trading"
-
-#: ../src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: ../src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr ""
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: ../src/client.cpp:715
-msgid "Entering game world"
-msgstr ""
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Stop"
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
-msgid "Equip"
-msgstr "Equip"
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Rotate the stick"
 
-#: ../src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
-msgstr "Equip arrows first."
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Keyboard"
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Equipment"
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Assign"
 
-#: ../src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Equipment Window"
+#: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Assign"
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "Error"
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Default"
 
-#: ../src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Error creating guild."
+#: src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Key Conflict(s) Detected."
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
-msgid "Error creating updates directory!"
-msgstr "Error creating updates directory!"
+#: src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Name"
 
-#: ../src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Command: /join <channel>"
+#: src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Relation"
 
-#: ../src/gui/serverdialog.cpp:456
-msgid "Error retreiving server list!"
-msgstr ""
+#: src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutral"
 
-#: ../src/game.cpp:951
-#, c-format
-msgid "Error while loading %s"
-msgstr "Error while loading %s"
+#: src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Friend"
 
-#: ../src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
+#: src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Disregarded"
 
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "Exp Notification"
+#: src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Ignored"
 
-#: ../src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "Exp:"
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
+msgid "???"
+msgstr "???"
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr "Experience sharing disabled."
+#: src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Allow trading"
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr "Experience sharing enabled."
+#: src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Allow whispers"
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr "Experience sharing not possible."
+#: src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Put all whispers in tabs"
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
+#: src/gui/setup_players.cpp:233
 #, fuzzy
-msgid "Experience sharing unknown."
-msgstr "Experience sharing enabled."
+msgid "Show gender"
+msgstr "Show name"
 
-#: ../src/gui/setup_video.cpp:238
+#: src/gui/setup_players.cpp:235
 #, fuzzy
-msgid "FPS limit:"
-msgstr "FPS Limit:"
-
-#: ../src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Failed to add item for unknown reason."
+msgid "Enable Chat log"
+msgstr "Unable to sell."
 
-#: ../src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Failed to add item. Trade partner has no free slot."
+#: src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Players"
 
-#: ../src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Failed to add item. Trade partner is over weighted."
+#: src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "When ignoring:"
 
-#: ../src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/setup_video.cpp:134
+msgid "Tiny"
+msgstr "Tiny"
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Failed to create character. Most likely the name is already taken."
+#: src/gui/setup_video.cpp:135
+msgid "Small"
+msgstr "Small"
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "Failed to delete character."
+#: src/gui/setup_video.cpp:136
+msgid "Medium"
+msgstr "Medium"
 
-#: ../src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Failed to promote member."
+#: src/gui/setup_video.cpp:137
+msgid "Large"
+msgstr "Large"
 
-#: ../src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "Failed to send as sender or letter invalid."
+#: src/gui/setup_video.cpp:163
+msgid "No text"
+msgstr "No text"
 
-#: ../src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Failed to start recording."
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Text"
 
-#: ../src/gui/setup_video.cpp:434
-#, fuzzy
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:165
+msgid "Bubbles, no names"
+msgstr "Bubbles, no names"
 
-#: ../src/gui/setup_video.cpp:428
-#, fuzzy
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:166
+msgid "Bubbles with names"
+msgstr "Bubbles with names"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
-msgid "Failed to use item."
-msgstr "Failed to use item."
+#: src/gui/setup_video.cpp:178
+msgid "off"
+msgstr "off"
 
-#: ../src/client.cpp:927
-msgid "Farewell, come back any time..."
-msgstr ""
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
+msgid "low"
+msgstr "low"
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
-msgid "Female"
-msgstr "Female"
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
+msgid "high"
+msgstr "high"
 
-#: ../src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "Find Path to Mouse"
+#: src/gui/setup_video.cpp:193
+msgid "medium"
+msgstr "medium"
 
-#: ../src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Finishing recording."
+#: src/gui/setup_video.cpp:195
+msgid "max"
+msgstr "max"
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:217
+msgid "Full screen"
+msgstr "Full screen"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:218
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Font size"
+#: src/gui/setup_video.cpp:219
+msgid "Custom cursor"
+msgstr "Custom cursor"
 
-#: ../src/commandhandler.cpp:205
-msgid "For more information, type /help <command>."
-msgstr "For more information, type /help <command>."
+#: src/gui/setup_video.cpp:221
+msgid "Visible names"
+msgstr "Visible names"
 
-#: ../src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Friend"
+#: src/gui/setup_video.cpp:223
+msgid "Particle effects"
+msgstr "Particle effects"
 
-#: ../src/gui/setup_video.cpp:219
-msgid "Full screen"
-msgstr "Full screen"
+#: src/gui/setup_video.cpp:225
+#, fuzzy
+msgid "Show own name"
+msgstr "Show name"
 
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "GM Names"
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
 
-#: ../src/net/tmwa/gamehandler.cpp:101
-#, fuzzy
-msgid "Game"
-msgstr "Name"
+#: src/gui/setup_video.cpp:227
+msgid "Show pickup notification"
+msgstr "Show pickup notification"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Game Over!"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
+msgid "in chat"
+msgstr "in chat"
 
-#: ../src/game.cpp:169
-msgid "General"
-msgstr "General"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
+msgid "as particle"
+msgstr "as particle"
 
-#: ../src/gui/widgets/chattab.cpp:126
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Global announcement from %s:"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "FPS limit:"
+msgstr "FPS Limit:"
 
-#: ../src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Global announcement:"
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
-msgstr "Disconnected from server!"
+#: src/gui/setup_video.cpp:250
+msgid "Video"
+msgstr "Video"
 
-#: ../src/gui/setup_colors.cpp:123
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Green:"
-msgstr "Green: "
+msgid "Show damage"
+msgstr "Show name"
 
-#: ../src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:258
+msgid "Overhead text"
+msgstr "Overhead text"
+
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Gui opacity"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Guild"
-
-#: ../src/gui/socialwindow.cpp:143
-#, fuzzy, c-format
-msgid "Guild %s quit requested."
-msgstr "Guild created."
-
-#: ../src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Guild"
+#: src/gui/setup_video.cpp:260
+msgid "Ambient FX"
+msgstr "Ambient FX"
 
-#: ../src/gui/socialwindow.cpp:543
+#: src/gui/setup_video.cpp:261
 #, fuzzy
-msgid "Guild Name"
-msgstr "Guild"
-
-#: ../src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Guild created."
+msgid "Particle detail"
+msgstr "Particle Detail"
 
-#: ../src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
-msgstr ""
+#: src/gui/setup_video.cpp:262
+msgid "Font size"
+msgstr "Font size"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
-msgid "Guild name is missing."
-msgstr "Party name is missing."
+msgid "None"
+msgstr "No"
 
-#: ../src/gui/statuswindow.cpp:203
+#: src/gui/setup_video.cpp:426
 #, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: ../src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
-
-#: ../src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "HP:"
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "mode and restoration of old mode also failed!"
 
-#: ../src/gui/charcreatedialog.cpp:74
+#: src/gui/setup_video.cpp:432
 #, fuzzy
-msgid "Hair color:"
-msgstr "Hair Colour:"
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr "mode and restoration of old mode also failed!"
 
-#: ../src/gui/charcreatedialog.cpp:77
+#: src/gui/setup_video.cpp:443
 #, fuzzy
-msgid "Hair style:"
-msgstr "Hair Style:"
+msgid "Switching to Full Screen"
+msgstr "Switching to full screen"
 
-#: ../src/gui/help.cpp:37
-msgid "Help"
-msgstr "Help"
+#: src/gui/setup_video.cpp:444
+msgid "Restart needed for changes to take effect."
+msgstr "Restart needed for changes to take effect."
 
-#: ../src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Help Window"
+#: src/gui/setup_video.cpp:458
+#, fuzzy
+msgid "Changing to OpenGL"
+msgstr "Changing OpenGL"
 
-#: ../src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Hide Windows"
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Huh? What's that?"
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "I guess this did not run too well."
+#: src/gui/setup_video.cpp:467
+msgid "Applying change to OpenGL requires restart."
+msgstr "Applying change to OpenGL requires restart."
 
-#: ../src/commandhandler.cpp:241
-msgid "If <channel> doesn't exist, it's created."
-msgstr "If <channel> doesn't exist, it's created."
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Experience sharing disabled."
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "If you weren't so animated, you'd be pushing up the daisies."
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "If you're the last person in the channel, it will be deleted."
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
+#, fuzzy
+msgid "Screen Resolution Changed"
+msgstr "Screen resolution changed"
 
-#: ../src/gui/popupmenu.cpp:108
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "Ignored"
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
+msgid "Restart your client for the change to take effect."
+msgstr "Restart your client for the change to take effect."
 
-#: ../src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "Ignore input 1"
+#: src/gui/setup_video.cpp:579
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "Ignore input 2"
+#: src/gui/setup_video.cpp:612
+#, fuzzy
+msgid "Particle Effect Settings Changed."
+msgstr "Particle effect settings changed."
 
-#: ../src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Ignored"
+#: src/gui/setup_video.cpp:613
+msgid "Changes will take effect on map change."
+msgstr "Changes will take effect on map change."
 
-#: ../src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Ignoring incoming trade requests"
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Skills"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignoring incoming trade requests."
+#: src/gui/skilldialog.cpp:223
+msgid "Up"
+msgstr "Up"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Info"
+#: src/gui/skilldialog.cpp:269
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Skill points: %d"
 
-#: ../src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "Insert coin to continue."
+#: src/gui/skilldialog.cpp:351
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Skill points: %d"
 
-#: ../src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "Insufficient HP!"
+#: src/gui/skilldialog.cpp:360
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Skills"
 
-#: ../src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "Insufficient SP!"
+#: src/gui/skilldialog.cpp:442
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Level: %d"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Intelligence"
+#: src/gui/skilldialog.cpp:453
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Level: %d"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
+#: src/gui/socialwindow.cpp:126
 #, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligence %+d"
-
-#: ../src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Intelligence:"
-
-#: ../src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
-msgstr ""
+#: src/gui/socialwindow.cpp:139
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Guild created."
 
-#: ../src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
+#: src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
+#: src/gui/socialwindow.cpp:154
+#, c-format
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: ../src/client.cpp:1244
-#, fuzzy, c-format
-msgid "Invalid update host: %s"
-msgstr "Invalid update host: "
-
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inventory"
-
-#: ../src/keyboardconfig.cpp:72
-msgid "Inventory Window"
-msgstr "Inventory Window"
-
-#: ../src/localplayer.cpp:1254
-#, fuzzy
-msgid "Inventory is full."
-msgstr "Server is full"
-
-#: ../src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
-msgid "Invite"
-msgstr "Invite User"
-
-#: ../src/gui/popupmenu.cpp:130
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|Invite %s to join your guild@@"
+msgid "Leave Guild?"
+msgstr "Create Guild"
 
-#: ../src/gui/popupmenu.cpp:134
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|Invite %s to join your party@@"
-
-#: ../src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Invite sent."
-
-#: ../src/gui/socialwindow.cpp:128
-#, c-format
-msgid "Invited user %s to guild %s."
-msgstr ""
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Are you sure you want to quit?"
 
-#: ../src/net/tmwa/partyhandler.cpp:335
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Invite a user to party"
 
-#: ../src/net/tmwa/partyhandler.cpp:340
+#: src/gui/socialwindow.cpp:218
 #, c-format
-msgid "Inviting failed, because you can't see a player called %s."
+msgid "Party %s quit requested."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Item Shortcut %d"
-
-#: ../src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Item Shortcut Window"
+#: src/gui/socialwindow.cpp:232
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Invite a user to party"
 
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
+#: src/gui/socialwindow.cpp:233
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
+#: src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
-msgstr ""
+#: src/gui/socialwindow.cpp:243
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Are you sure you want to quit?"
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Item sharing disabled."
+#: src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Create Guild"
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Item sharing enabled."
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
+#, fuzzy
+msgid "Create Party"
+msgstr "Create Character"
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "Item sharing not possible."
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:141
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
-msgid "Item sharing unknown."
-msgstr "Item sharing enabled."
+msgid "Invite"
+msgstr "Invite User"
 
-#: ../src/gui/statuswindow.cpp:234
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
-msgid "Job"
-msgstr "Job:"
+msgid "Leave"
+msgstr "Large"
 
-#: ../src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Job:"
+#: src/gui/socialwindow.cpp:443
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Accepted invite from %s."
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
-#, c-format
-msgid "Job: %d"
-msgstr "Job: %d"
+#: src/gui/socialwindow.cpp:449
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Rejected invite from %s."
 
-#: ../src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Joined party."
+#: src/gui/socialwindow.cpp:462
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Accepted invite from %s."
 
-#: ../src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: src/gui/socialwindow.cpp:468
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Rejected invite from %s."
 
-#: ../src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Key Conflict(s) Detected."
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Keyboard"
+#: src/gui/socialwindow.cpp:504
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Error creating guild."
 
-#: ../src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Kick failed!"
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:163
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|Kick monster@@"
+msgid "Guild Name"
+msgstr "Guild"
 
-#: ../src/gui/popupmenu.cpp:141
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
-msgid "Kick player"
-msgstr "Kick failed!"
+msgid "Choose your guild's name."
+msgstr "Choose your server"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Kick succeeded!"
+#: src/gui/socialwindow.cpp:554
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Received party request, but one already exists."
 
-#: ../src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Large"
+#: src/gui/socialwindow.cpp:559
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s has invited you to join the %s party."
 
-#: ../src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
-msgid "Leave"
-msgstr "Large"
+msgid "Accept Guild Invite"
+msgstr "Accept Party Invite"
+
+#: src/gui/socialwindow.cpp:576
+msgid "Received party request, but one already exists."
+msgstr "Received party request, but one already exists."
 
-#: ../src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
-msgid "Leave Guild?"
-msgstr "Create Guild"
+msgid "You have been invited you to join a party."
+msgstr "%s has invited you to join their party."
 
-#: ../src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
-msgstr ""
+#: src/gui/socialwindow.cpp:589
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s has invited you to join the %s party."
 
-#: ../src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Level: %d"
+#: src/gui/socialwindow.cpp:597
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s has invited you to join their party."
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/socialwindow.cpp:602
 #, c-format
-msgid "Level: %d"
-msgstr "Level: %d"
+msgid "%s has invited you to join the %s party."
+msgstr "%s has invited you to join the %s party."
 
-#: ../src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Requesting to join channel %s."
+#: src/gui/socialwindow.cpp:610
+msgid "Accept Party Invite"
+msgstr "Accept Party Invite"
 
-#: ../src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Critical Hit"
+#: src/gui/socialwindow.cpp:621
+msgid "Cannot create party. You are already in a party"
+msgstr ""
 
-#: ../src/gui/userpalette.cpp:107
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "Player hits Monster"
+msgid "Party Name"
+msgstr "Party"
 
-#: ../src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
+#: src/gui/socialwindow.cpp:627
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Choose your server"
 
-#: ../src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
+msgid "Specials"
 msgstr ""
 
-#: ../src/client.cpp:682
-#, fuzzy
-msgid "Logging in"
-msgstr "Login"
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
+#, c-format
+msgid "Level: %d"
+msgstr "Level: %d"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
-msgid "Login"
-msgstr "Login"
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
+#, c-format
+msgid "Money: %s"
+msgstr "Money: %s"
 
-#: ../src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#: src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "HP:"
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Looks like you got your head handed to you."
+#: src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Exp:"
 
-#: ../src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Luck"
+#: src/gui/statuswindow.cpp:130
+msgid "MP:"
+msgstr "MP:"
 
-#: ../src/net/tmwa/generalhandler.cpp:106
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
-msgid "Luck %+d"
-msgstr "Luck %+d"
+msgid "Job: %d"
+msgstr "Job: %d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Luck:"
+#: src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Job:"
 
-#: ../src/gui/skilldialog.cpp:455
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Level: %d"
+msgid "Character points: %d"
+msgstr "Character stats OK"
 
-#: ../src/gui/skilldialog.cpp:444
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Level: %d"
-
-#: ../src/net/tmwa/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Attack"
-msgstr "M.Attack:"
+msgid "Correction points: %d"
+msgstr "Skill points: %d"
 
-#: ../src/net/tmwa/generalhandler.cpp:227
-#, fuzzy
-msgid "M.Defense"
-msgstr "M.Defense:"
+#: src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Propose trade"
 
-#: ../src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
+#: src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Confirmed. Waiting..."
 
-#: ../src/resources/itemdb.cpp:56
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+#: src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Agree trade"
 
-#: ../src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "MP:"
+#: src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Agreed. Waiting..."
 
-#: ../src/net/tmwa/chathandler.cpp:190
-#, fuzzy
-msgid "MVP player."
-msgstr "Player"
+#: src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Trade: You"
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
-msgid "Male"
-msgstr "Male"
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Trade"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Map"
+#: src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Add"
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Name: %s"
+msgid "You get %s"
+msgstr "You get %s."
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Max"
+#: src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "You give:"
 
-#: ../src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Medium"
+#: src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Change"
 
-#: ../src/gui/socialwindow.cpp:157
-msgid "Member Invite to Guild"
+#: src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"Failed adding item. You can not overlap one kind of item on the window."
 
-#: ../src/gui/socialwindow.cpp:236
-#, fuzzy
-msgid "Member Invite to Party"
-msgstr "/party > Invite a user to party"
-
-#: ../src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Member was promoted successfully."
+#: src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "You don't have enough money."
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Message"
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Name: %s"
 
-#: ../src/commandhandler.cpp:480
-msgid "Message closes chat."
-msgstr "Message closes chat."
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Updating..."
 
-#: ../src/commandhandler.cpp:493
-msgid "Message now closes chat."
-msgstr "Message now closes chat."
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Connecting..."
 
-#: ../src/keyboardconfig.cpp:75
-msgid "Minimap Window"
-msgstr "Minimap Window"
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Play"
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "MiniMap"
+#: src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1  The update process is incomplete."
 
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Misses"
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1  It is strongly recommended that"
 
-#: ../src/gui/statuswindow.cpp:224
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
-msgid "Money"
-msgstr "Money: %d"
-
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
-#, c-format
-msgid "Money: %s"
-msgstr "Money: %s"
+msgid "##1  you try again later."
+msgstr "##1  you try again later"
 
-#: ../src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Monster hits Player"
+#: src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Completed"
 
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Monsters"
+#: src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Lists the users in the current channel"
 
-#: ../src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Move Down"
+#: src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Set the topic of the current channel"
 
-#: ../src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Move Left"
+#: src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Leave a channel"
 
-#: ../src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Move Right"
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Make a user a channel operator"
 
-#: ../src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Move Up"
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Kick a user from the channel"
 
-#: ../src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Music volume"
+#: src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Command: /users"
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
-#, fuzzy, c-format
-msgid "Music: %s"
-msgstr "Topic: %s"
+#: src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "This command shows the users in this channel."
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Command: /topic <message>"
 
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPCs"
+#: src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "This command sets the topic to <message>."
 
-#: ../src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Name"
+#: src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Command: /quit"
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Name:"
+#: src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "This command leaves the current channel."
 
-#: ../src/gui/unregisterdialog.cpp:51
-#, c-format
-msgid "Name: %s"
-msgstr "Name: %s"
+#: src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "If you're the last person in the channel, it will be deleted."
 
-#: ../src/gui/ministatus.cpp:157
-msgid "Need"
-msgstr ""
+#: src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Command: /op <nick>"
 
-#: ../src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Need a user to kick!"
+#: src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "This command makes <nick> a channel operator."
 
-#: ../src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
-msgstr "Need a user to op!"
+#: src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
+msgstr "Channel operators can kick and op other users from the channel."
 
-#: ../src/game.cpp:372
-msgid "Network Error"
-msgstr "Network Error"
+#: src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Command: /kick <nick>"
 
-#: ../src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutral"
+#: src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "This command makes <nick> leave the channel."
 
-#: ../src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "New email address incorrect"
+#: src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr "Need a user to op!"
 
-#: ../src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "New password incorrect"
+#: src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Need a user to kick!"
 
-#: ../src/net/tmwa/loginhandler.cpp:92
-#, fuzzy
-msgid "New password too short."
-msgstr "New password too short"
+#: src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Global announcement:"
 
-#: ../src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Next"
+#: src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Global announcement from %s:"
 
-#: ../src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Next Chat Tab"
+#: src/gui/widgets/chattab.cpp:153
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "%s whispers: "
 
-#: ../src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "No"
+#: src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Cannot send empty chat!"
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
+#: src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
+#: src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "No gameservers are available."
-
-#: ../src/net/tmwa/generalhandler.cpp:132
-#, fuzzy
-msgid "No servers available."
-msgstr "No servers available"
+#: src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Close the whisper tab"
 
-#: ../src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "No text"
+#: src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Command: /close"
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
+#: src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "This command closes the current whisper tab."
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
-msgid "None"
-msgstr "No"
+msgid "Command: /ignore"
+msgstr "Command: /item"
 
-#: ../src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Not currently recording."
+#: src/gui/widgets/whispertab.cpp:90
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "This command displays the number of players currently online."
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
-msgid "Not logged in."
-msgstr "Already logged in"
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "This command starts recording the chat log to the file <filename>."
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Nothing to sell."
+#: src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Status"
 
-#: ../src/gui/setup_audio.cpp:94
-#, fuzzy
-msgid "Notice"
-msgstr "No text"
+#: src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Shortcut"
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
-msgid "OK"
-msgstr "OK"
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Select OK"
 
-#: ../src/net/manaserv/loginhandler.cpp:152
+#: src/gui/worldselectdialog.cpp:76
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Old email address incorrect"
+msgid "Change Login"
+msgstr "Change"
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
+#: src/gui/worldselectdialog.cpp:77
 #, fuzzy
-msgid "Old password incorrect."
-msgstr "Old password incorrect"
+msgid "Choose World"
+msgstr "Choose your server"
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr ""
+#: src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Move Up"
 
-#: ../src/net/tmwa/gamehandler.cpp:87
-#, c-format
-msgid "Online users: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Move Down"
 
-#: ../src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Move Left"
 
-#: ../src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Move Right"
 
-#: ../src/main.cpp:43
-msgid "Options:"
-msgstr "Options:"
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Attack"
 
-#: ../src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Player hits Monster"
+#: src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Target & Attack"
 
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Other Players' Names"
+#: src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Smiley"
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Talk"
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr ""
+#: src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Stop Attack"
 
-#: ../src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:48
 #, fuzzy
-msgid "Outfits Window"
-msgstr "Status Window"
-
-#: ../src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr "Overhead text"
+msgid "Target Monster"
+msgstr "Target Closest"
 
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Own Name"
+#: src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "Target NPC"
 
-#: ../src/gui/setup_video.cpp:615
-#, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Particle effect settings changed."
+#: src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Target Player"
 
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Particle Effects"
+#: src/keyboardconfig.cpp:51
+msgid "Pickup"
+msgstr "Pick up"
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Particle Effects"
+#: src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Hide Windows"
 
-#: ../src/gui/setup_video.cpp:263
-#, fuzzy
-msgid "Particle detail"
-msgstr "Particle Detail"
+#: src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Sit"
 
-#: ../src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Particle Detail"
+#: src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Screenshot"
 
-#: ../src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Particle effects"
+#: src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Allow/Disallow Trading"
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Party"
+#: src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "Find Path to Mouse"
 
-#: ../src/gui/socialwindow.cpp:222
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
-msgid "Party %s quit requested."
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Party"
-
-#: ../src/gui/socialwindow.cpp:629
-#, fuzzy
-msgid "Party Name"
-msgstr "Party"
-
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Party name is missing."
-
-#: ../src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Party successfully created."
+msgid "Item Shortcut %d"
+msgstr "Item Shortcut %d"
 
-#: ../src/gui/beingpopup.cpp:76
-#, fuzzy, c-format
-msgid "Party: %s"
-msgstr "Party (%s)"
+#: src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Help Window"
 
-#: ../src/client.cpp:885
-#, fuzzy
-msgid "Password Change"
-msgstr "Password:"
+#: src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Status Window"
 
-#: ../src/client.cpp:886
-msgid "Password changed successfully!"
-msgstr ""
+#: src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Inventory Window"
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Password:"
+#: src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Equipment Window"
 
-#: ../src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Passwords do not match."
+#: src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Skill Window"
 
-#: ../src/gui/popupmenu.cpp:188
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "Pick up"
+#: src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Minimap Window"
 
-#: ../src/keyboardconfig.cpp:52
-msgid "Pickup"
-msgstr "Pick up"
+#: src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Chat Window"
 
-#: ../src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "Pickup Notification"
+#: src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Item Shortcut Window"
 
-#: ../src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Play"
+#: src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Setup Window"
 
-#: ../src/commandhandler.cpp:545
-msgid "Player already ignored!"
-msgstr ""
+#: src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Debug Window"
 
-#: ../src/commandhandler.cpp:554
+#: src/keyboardconfig.cpp:79
 #, fuzzy
-msgid "Player could not be ignored!"
-msgstr "Whisper could not be sent, ignored by user."
+msgid "Social Window"
+msgstr "Skill Window"
 
-#: ../src/commandhandler.cpp:576
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "Whisper could not be sent, ignored by user."
+#: src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Emote Shortcut Window"
 
-#: ../src/net/manaserv/charhandler.cpp:193
+#: src/keyboardconfig.cpp:81
 #, fuzzy
-msgid "Player deleted."
-msgstr "Character deleted."
+msgid "Outfits Window"
+msgstr "Status Window"
 
-#: ../src/commandhandler.cpp:574
-msgid "Player no longer ignored!"
+#: src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
 msgstr ""
 
-#: ../src/commandhandler.cpp:552
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "Party successfully created."
-
-#: ../src/commandhandler.cpp:569
-msgid "Player wasn't ignored!"
+#: src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Players"
-
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Player hits Monster"
-
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
-msgid "Please distribute %d points"
-msgstr "Please distribute %d points"
+msgid "Emote Shortcut %d"
+msgstr "Emote Shortcut %d"
 
-#: ../src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Please remove %d points"
+#: src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Toggle Chat"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
-msgid "Please specify a name."
-msgstr ""
+#: src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Scroll Chat Up"
 
-#: ../src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Please type both the address and the port of a server."
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Scroll Chat Down"
 
-#: ../src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Poison had no effect..."
+#: src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "Previous Chat Tab"
 
-#: ../src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Port:"
+#: src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Next Chat Tab"
 
-#: ../src/gui/serverdialog.cpp:452
-msgid "Preparing download"
-msgstr ""
+#: src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "Select OK"
 
-#: ../src/gui/chat.cpp:307
-#, fuzzy, c-format
-msgid "Present: %s; %d players are present."
-msgstr "%d players are present."
+#: src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Ignore input 1"
 
-#: ../src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Press OK to respawn"
+#: src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Ignore input 2"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Press the button to start calibration"
+#: src/keyboardconfig.cpp:183
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Resolve them, or gameplay may result in strange behaviour."
 
-#: ../src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "Previous Chat Tab"
+#: src/localplayer.cpp:985
+msgid "Unable to pick up item."
+msgstr "Unable to pick up item."
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Price: %s / Total: %s"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:994
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "You picked up %s [@@%d|%s@@]."
+msgstr[1] "You picked up %s [@@%d|%s@@]."
 
-#: ../src/playerrelations.cpp:326
-msgid "Print '...'"
+#: src/main.cpp:42
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: ../src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Propose trade"
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Pulse"
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr "Put all whispers in tabs"
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Exit"
+#: src/main.cpp:47
+msgid "Options:"
+msgstr "Options:"
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Rainbow"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version     : Display the version"
 
-#: ../src/gui/socialwindow.cpp:556
+#: src/main.cpp:49
 #, fuzzy
-msgid "Received guild request, but one already exists."
-msgstr "Received party request, but one already exists."
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help        : Display this help"
 
-#: ../src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr "Received party request, but one already exists."
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : Configuration file to use"
 
-#: ../src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Recording…"
+#: src/main.cpp:51
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username    : Login with this username"
 
-#: ../src/gui/setup_colors.cpp:108
+#: src/main.cpp:52
 #, fuzzy
-msgid "Red:"
-msgstr "Red: "
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password    : Login with this password"
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
-msgid "Register"
-msgstr "Register"
+#: src/main.cpp:53
+#, fuzzy
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character   : Login with this character"
 
-#: ../src/gui/login.cpp:129
+#: src/main.cpp:54
 #, fuzzy
-msgid "Registration disabled"
-msgstr "Item sharing disabled."
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server      : Login server name or IP"
 
-#: ../src/net/tmwa/loginhandler.cpp:165
+#: src/main.cpp:55
 #, fuzzy
-msgid "Rejected from server."
-msgstr "Rejected from server"
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port        : Login server port"
 
-#: ../src/gui/socialwindow.cpp:472
-#, fuzzy, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Rejected invite from %s."
+#: src/main.cpp:56
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : Use this update host"
 
-#: ../src/gui/socialwindow.cpp:453
-#, fuzzy, c-format
-msgid "Rejected party invite from %s."
-msgstr "Rejected invite from %s."
+#: src/main.cpp:57
+#, fuzzy
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default     : Choose default character server and character"
 
-#: ../src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Relation"
+#: src/main.cpp:59
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Skip the update downloads"
 
-#: ../src/gui/login.cpp:60
+#: src/main.cpp:60
 #, fuzzy
-msgid "Remember username"
-msgstr "Remember Username"
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data        : Directory to load game data from"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Request for Trade"
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir    : Directory to use as home directory"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/main.cpp:62
 #, fuzzy
-msgid "Request to quit denied!"
-msgstr "Request for Trade"
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Configuration file to use"
 
-#: ../src/client.cpp:774
+#: src/main.cpp:63
 #, fuzzy
-msgid "Requesting characters"
-msgstr "Select Character"
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir    : Directory to use as home directory"
 
-#: ../src/client.cpp:858
-msgid "Requesting registration details"
-msgstr ""
+#: src/main.cpp:65
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl   : Disable OpenGL for this session"
 
-#: ../src/commandhandler.cpp:436
-#, c-format
-msgid "Requesting to join channel %s."
-msgstr "Requesting to join channel %s."
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "You are dead."
 
-#: ../src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Reset"
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "We regret to inform you that your character was killed in battle."
 
-#: ../src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Reset Windows"
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "You are not that alive anymore."
 
-#: ../src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr "Restart needed for changes to take effect."
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "The cold hands of the grim reaper are grasping for your soul."
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "Restart your client for the change to take effect."
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Game Over!"
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Retrieve"
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
 
-#: ../src/commandhandler.cpp:489
-msgid "Return now toggles chat."
-msgstr "Return now toggles chat."
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Your plan of breaking your enemy's weapon by bashing it with your throat "
+"failed."
 
-#: ../src/commandhandler.cpp:480
-msgid "Return toggles chat."
-msgstr "Return toggles chat."
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "I guess this did not run too well."
 
-#: ../src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Rotate the stick"
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Do you want your possessions identified?"
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Sadly, no trace of you was ever found..."
 
-#: ../src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Saving screenshot failed!"
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Annihilated."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Looks like you got your head handed to you."
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"You screwed up again, dump your body down the tubes and get yourself another "
+"one."
+
+#: src/net/manaserv/beinghandler.cpp:323
 #, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Screen resolution changed"
+msgid "Press OK to respawn."
+msgstr " Press OK to respawn"
 
-#: ../src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Screenshot"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "You died"
 
-#: ../src/game.cpp:333
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 #, fuzzy
-msgid "Screenshot saved as "
-msgstr "Screenshot saved to ~/"
+msgid "Not logged in."
+msgstr "Already logged in"
 
-#: ../src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Scroll Chat Down"
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Scroll Chat Up"
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Seems you need more money... ;-)"
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Username already exists"
 
-#: ../src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "Select OK"
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
 
-#: ../src/gui/worldselectdialog.cpp:71
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
-msgid "Select World"
-msgstr "Select OK"
+msgid "Character's stats are too high."
+msgstr "Character stats OK"
 
-#: ../src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Select amount of items to drop."
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Character stats OK"
 
-#: ../src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
-msgstr "Select amount of items to retrieve."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: ../src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Select amount of items to split."
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Unknown error"
 
-#: ../src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Select amount of items to store."
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
 
-#: ../src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Select amount of items to trade."
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Character deleted."
 
-#: ../src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Select amount of items to trade."
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Sell"
-
-#: ../src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Send"
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Unknown error"
 
-#: ../src/gui/serverdialog.cpp:211
-#, fuzzy
-msgid "Server type:"
-msgstr "Server:"
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "No gameservers are available."
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Server:"
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Topic: %s"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Setup"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Player hits Monster"
 
-#: ../src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Setup Window"
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Command: /join <channel>"
 
-#: ../src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Sfx volume"
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Requesting to join channel %s."
 
-#: ../src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Shop"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#: ../src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Shortcut"
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s joined the party."
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
-msgid "Show IP: Off"
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
 msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
-msgid "Show IP: On"
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254
-#, fuzzy
-msgid "Show damage"
-msgstr "Show name"
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:232
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
-msgid "Show gender"
-msgstr "Show name"
+msgid "Unknown channel event."
+msgstr "Unknown command."
 
-#: ../src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show own name"
-msgstr "Show name"
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Guild created."
 
-#: ../src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
-msgstr "Show pickup notification"
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Error creating guild."
 
-#: ../src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "Sit"
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Invite sent."
 
-#: ../src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Sit failed!"
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Member was promoted successfully."
 
-#: ../src/gui/skilldialog.cpp:362
-#, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Skills"
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Failed to promote member."
 
-#: ../src/gui/skilldialog.cpp:353
-#, fuzzy, c-format
-msgid "Skill Set %d"
-msgstr "Skill points: %d"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Wrong magic_token"
 
-#: ../src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Skill Window"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Already logged in"
 
-#: ../src/gui/skilldialog.cpp:271
-#, fuzzy, c-format
-msgid "Skill points available: %d"
-msgstr "Skill points: %d"
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Account expired"
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Skills"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "New password incorrect"
 
-#: ../src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr "Slots:"
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Old password incorrect"
 
-#: ../src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Small"
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Account not connected. Please login first."
 
-#: ../src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Smiley"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "New email address incorrect"
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
-msgid "Social"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Old email address incorrect"
 
-#: ../src/keyboardconfig.cpp:80
+#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "Social Window"
-msgstr "Skill Window"
+msgid "The new email address already exists."
+msgstr "The new Email Address already exists."
 
-#: ../src/gui/setup_video.cpp:582
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:136
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Someone else is trying to use this account"
-
-#: ../src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Sound"
-
-#: ../src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr ""
+msgid "Client version is too old."
+msgstr "Client version is too old"
 
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Wrong username or password"
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Account expired"
 
-#: ../src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Spectrum"
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Wrong username, password or email address"
 
-#: ../src/net/tmwa/generalhandler.cpp:142
+#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Speed hack detected."
-msgstr "Speed hack detected"
+msgid "Username already exists."
+msgstr "Username already exists"
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
-msgid "Split"
-msgstr "Split"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Email address already exists"
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: ../src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Starting to record..."
-
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Static"
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Joined party."
 
-#: ../src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Status"
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s joined the party."
 
-#: ../src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Status Window"
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s refused your invitation."
 
-#: ../src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Stop"
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Accepting incoming trade requests."
 
-#: ../src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Stop Attack"
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignoring incoming trade requests."
 
-#: ../src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Stop recording"
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Request for Trade"
 
-#: ../src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Storage"
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s wants to trade with you, do you accept?"
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
-msgid "Store"
-msgstr "Store"
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Trading with %s"
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Strength"
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Trade canceled."
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Strength %+d"
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Trade completed."
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Strength:"
+#: src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Kick failed!"
 
-#: ../src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Submit"
+#: src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Kick succeeded!"
 
-#: ../src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr ""
+#: src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Nothing to sell."
 
-#: ../src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Switch character"
+#: src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Thanks for buying."
 
-#: ../src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Switch server"
+#: src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Unable to buy."
 
-#: ../src/gui/setup_video.cpp:445
-#, fuzzy
-msgid "Switching to Full Screen"
-msgstr "Switching to full screen"
+#: src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Thanks for selling."
 
-#: ../src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Talk"
+#: src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Unable to sell."
 
-#: ../src/gui/popupmenu.cpp:150
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@talk|Talk To %s@@"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Target & Attack"
+#: src/net/tmwa/charserverhandler.cpp:107
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Cannot use this ID"
 
-#: ../src/keyboardconfig.cpp:49
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Target Monster"
-msgstr "Target Closest"
+msgid "Unknown char-server failure."
+msgstr "Unknown error"
 
-#: ../src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "Target NPC"
+#: src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Failed to create character. Most likely the name is already taken."
 
-#: ../src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Target Player"
+#: src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Character deleted."
 
-#: ../src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Text"
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Failed to delete character."
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Thanks for buying."
+#: src/net/tmwa/charserverhandler.cpp:266
+msgid "Strength:"
+msgstr "Strength:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Thanks for selling."
+#: src/net/tmwa/charserverhandler.cpp:267
+msgid "Agility:"
+msgstr "Agility:"
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "The cold hands of the grim reaper are grasping for your soul."
+#: src/net/tmwa/charserverhandler.cpp:268
+msgid "Vitality:"
+msgstr "Vitality:"
 
-#: ../src/game.cpp:368
-#, fuzzy
-msgid "The connection to the server was lost."
-msgstr "The connection to the server was lost, the program will now quit."
+#: src/net/tmwa/charserverhandler.cpp:269
+msgid "Intelligence:"
+msgstr "Intelligence:"
 
-#: ../src/gui/changeemaildialog.cpp:141
-#, fuzzy
-msgid "The email address entries mismatch."
-msgstr "The new Email Address already exists."
+#: src/net/tmwa/charserverhandler.cpp:270
+msgid "Dexterity:"
+msgstr "Dexterity:"
 
-#: ../src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "The new Email Address already exists."
+#: src/net/tmwa/charserverhandler.cpp:271
+msgid "Luck:"
+msgstr "Luck:"
 
-#: ../src/gui/changeemaildialog.cpp:127
+#: src/net/tmwa/chathandler.cpp:87
 #, fuzzy, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "The username needs to be at least %d characters long."
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Whisper could not be sent, user is offline."
 
-#: ../src/gui/changeemaildialog.cpp:134
+#: src/net/tmwa/chathandler.cpp:96
 #, fuzzy, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "The username needs to be less than %d characters long."
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Whisper could not be sent, ignored by user."
 
-#: ../src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
+#: src/net/tmwa/chathandler.cpp:230
+#, fuzzy
+msgid "MVP player."
+msgstr "Player"
+
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Channels are not supported!"
+
+#: src/net/tmwa/gamehandler.cpp:88
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "The password needs to be at least %d characters long."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Game"
+msgstr "Name"
 
-#: ../src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "The password needs to be less than %d characters long."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Request for Trade"
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "The password needs to be at least %d characters long."
+msgid "Strength %+d"
+msgstr "Strength %+d"
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "The password needs to be less than %d characters long."
+msgid "Agility %+d"
+msgstr "Agility %+d"
 
-#: ../src/gui/register.cpp:166
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "The username needs to be at least %d characters long."
+msgid "Vitality %+d"
+msgstr "Vitality %+d"
 
-#: ../src/gui/register.cpp:174
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "The username needs to be less than %d characters long."
+msgid "Intelligence %+d"
+msgstr "Intelligence %+d"
+
+#: src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Dexterity %+d"
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
+msgstr "Luck %+d"
+
+#: src/net/tmwa/generalhandler.cpp:132
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Authentication failed"
+
+#: src/net/tmwa/generalhandler.cpp:135
+#, fuzzy
+msgid "No servers available."
+msgstr "No servers available"
+
+#: src/net/tmwa/generalhandler.cpp:139
+#, fuzzy
+msgid "Someone else is trying to use this account."
+msgstr "Someone else is trying to use this account"
 
-#: ../src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "This account is already logged in"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:81
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "This command causes the player to leave the party."
+msgid "Speed hack detected."
+msgstr "Speed hack detected"
 
-#: ../src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "This command causes the player to leave the party."
+#: src/net/tmwa/generalhandler.cpp:148
+#, fuzzy
+msgid "Duplicated login."
+msgstr "Duplicated login"
 
-#: ../src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "This command changes the party's experience sharing policy."
+#: src/net/tmwa/generalhandler.cpp:151
+#, fuzzy
+msgid "Unknown connection error."
+msgstr "Unknown connection error"
 
-#: ../src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr "This command changes the party's item sharing policy."
+#: src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Disconnected from server!"
 
-#: ../src/commandhandler.cpp:275
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "This command sets the topic to <message>."
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Strength"
 
-#: ../src/commandhandler.cpp:229
-msgid "This command clears the chat log of previous chat."
-msgstr "This command clears the chat log of previous chat."
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Agility"
 
-#: ../src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "This command closes the current whisper tab."
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Vitality"
 
-#: ../src/commandhandler.cpp:280
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "These commands create a new party called <party-name>."
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Intelligence"
 
-#: ../src/commandhandler.cpp:210
-msgid "This command displays a list of all commands available."
-msgstr "This command displays a list of all commands available."
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Dexterity"
 
-#: ../src/commandhandler.cpp:213
-msgid "This command displays help on <command>."
-msgstr "This command displays help on <command>."
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Luck"
 
-#: ../src/commandhandler.cpp:324
-msgid "This command displays the name of the current map."
-msgstr "This command displays the name of the current map."
+#: src/net/tmwa/generalhandler.cpp:238
+#, fuzzy
+msgid "Defense"
+msgstr "Defense:"
 
-#: ../src/commandhandler.cpp:329
-msgid "This command displays the number of players currently online."
-msgstr "This command displays the number of players currently online."
+#: src/net/tmwa/generalhandler.cpp:239
+#, fuzzy
+msgid "M.Attack"
+msgstr "M.Attack:"
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr "This command displays the party's current experience sharing policy."
+#: src/net/tmwa/generalhandler.cpp:240
+#, fuzzy
+msgid "M.Defense"
+msgstr "M.Defense:"
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr "This command displays the party's current item sharing policy."
+#: src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Accuracy:"
 
-#: ../src/commandhandler.cpp:313
-msgid "This command displays the return toggle status."
-msgstr "This command displays the return toggle status."
+#: src/net/tmwa/generalhandler.cpp:242
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% Evade:"
 
-#: ../src/commandhandler.cpp:302
-msgid "This command finishes a recording session."
-msgstr "This command finishes a recording session."
+#: src/net/tmwa/generalhandler.cpp:243
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "Critical Hit"
 
-#: ../src/commandhandler.cpp:292
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Guild"
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Display this help."
 
-#: ../src/commandhandler.cpp:234
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "This command displays the number of players currently online."
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invite a player to your party"
 
-#: ../src/gui/widgets/whispertab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr "This command displays the number of players currently online."
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Leave the party you are in"
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "This command invites <nick> to party with you."
+#: src/net/tmwa/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Kick some one from the party you are in"
+
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Command: /invite <nick>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "This command invites <nick> to party with you."
 
-#: ../src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "This command leaves the current channel."
-
-#: ../src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "This command makes <nick> a channel operator."
-
-#: ../src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "This command makes <nick> leave the channel."
-
-#: ../src/commandhandler.cpp:240
-msgid "This command makes you enter <channel>."
-msgstr "This command makes you enter <channel>."
-
-#: ../src/commandhandler.cpp:223
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "This command sends the message <msg> to all players currently online."
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Command: /leave"
 
-#: ../src/commandhandler.cpp:258
-msgid "This command sends the text <message> to <nick>."
-msgstr "This command sends the text <message> to <nick>."
+#: src/net/tmwa/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "This command causes the player to leave the party."
 
-#: ../src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "This command sets the topic to <message>."
+#: src/net/tmwa/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Party name is missing."
 
-#: ../src/commandhandler.cpp:307
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
 msgstr ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-
-#: ../src/commandhandler.cpp:246
-msgid "This command shows a list of all channels."
-msgstr "This command shows a list of all channels."
 
-#: ../src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "This command shows the users in this channel."
+#: src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
+msgstr ""
 
-#: ../src/commandhandler.cpp:299
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "This command starts recording the chat log to the file <filename>."
+#: src/net/tmwa/guildhandler.cpp:306
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s is now a member of your party."
 
-#: ../src/commandhandler.cpp:318
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:95
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "This command starts recording the chat log to the file <filename>."
-
-#: ../src/commandhandler.cpp:251
-msgid "This command tell others you are (doing) <msg>."
-msgstr "This command tell others you are (doing) <msg>."
+msgid "Unknown guild invite response."
+msgstr "Unknown invite response for %s."
 
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
+#: src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: ../src/commandhandler.cpp:266
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr "This command tries to make a tab for whispers between you and <nick>."
-
-#: ../src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "This is what the colour looks like"
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Party"
 
-#: ../src/net/tmwa/loginhandler.cpp:179
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "This user name is already taken"
+#: src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Invite a player to your party"
 
-#: ../src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Tiny"
+#: src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Leave the party you are in"
 
-#: ../src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "To:"
+#: src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Kick some one from the party you are in"
 
-#: ../src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr "Toggle Chat"
+#: src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Show/change party item sharing options"
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Topic: %s"
+#: src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Show/change party experience sharing options"
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Trade"
+#: src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "This command causes the player to leave the party."
 
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Trade canceled."
+#: src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Command: /item <policy>"
 
-#: ../src/net/tmwa/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Trade cancelled due to an unknown reason."
+#: src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr "This command changes the party's item sharing policy."
 
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Trade completed."
+#: src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
 
-#: ../src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Trade failed!"
+#: src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Command: /item"
 
-#: ../src/net/tmwa/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Trade with %s cancelled."
+#: src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr "This command displays the party's current item sharing policy."
 
-#: ../src/gui/popupmenu.cpp:83
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "Trading with %s"
+#: src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Command: /exp <policy>"
 
-#: ../src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Trade: You"
+#: src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr "This command changes the party's experience sharing policy."
 
-#: ../src/net/tmwa/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Trade: You and %s"
+#: src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 
-#: ../src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Trading isn't possible. Character doesn't exist."
+#: src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Command: /exp"
 
-#: ../src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Trading isn't possible. Trade partner is too far away."
+#: src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr "This command displays the party's current experience sharing policy."
 
-#: ../src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Trading with %s"
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Item sharing enabled."
 
-#: ../src/gui/setup_video.cpp:477
-#, fuzzy
-msgid "Transparency disabled"
-msgstr "Experience sharing disabled."
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Item sharing disabled."
 
-#: ../src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
-msgstr ""
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "Item sharing not possible."
 
-#: ../src/localplayer.cpp:1251
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
-msgid "Tried to pick up nonexistent item."
-msgstr "Unable to pick up item."
+msgid "Item sharing unknown."
+msgstr "Item sharing enabled."
 
-#: ../src/commandhandler.cpp:335
-msgid "Type /help for a list of commands."
-msgstr "Type /help for a list of commands."
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Experience sharing enabled."
 
-#: ../src/gui/changeemaildialog.cpp:51
-#, fuzzy
-msgid "Type new email address twice:"
-msgstr "Type new email address twice:"
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr "Experience sharing disabled."
 
-#: ../src/gui/changepassworddialog.cpp:63
-#, fuzzy
-msgid "Type new password twice:"
-msgstr "Type new password twice:"
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "Experience sharing not possible."
 
-#: ../src/gui/setup_colors.cpp:71
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
-msgid "Type:"
-msgstr "Type: "
+msgid "Experience sharing unknown."
+msgstr "Experience sharing enabled."
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Unable to buy."
+#: src/net/tmwa/inventoryhandler.cpp:285
+msgid "Failed to use item."
+msgstr "Failed to use item."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Unable to equip."
 
-#: ../src/net/tmwa/network.cpp:345
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Unable to sell."
-
-#: ../src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Unable to sell."
-
-#: ../src/net/tmwa/inventoryhandler.cpp:418
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Unable to unequip."
 
-#: ../src/gui/setup_keyboard.cpp:90
-#, fuzzy
-msgid "Unassign"
-msgstr "Assign"
-
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
-msgid "Unequip"
-msgstr "Unequip"
-
-#: ../src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "Unequip"
-
-#: ../src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "Unhandled trade cancel packet."
-
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr ""
+#: src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Account was not found. Please re-login."
 
-#: ../src/net/net.cpp:145
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Unknown Item Type"
+msgid "New password too short."
+msgstr "New password too short"
 
-#: ../src/net/manaserv/chathandler.cpp:327
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
-msgid "Unknown channel event."
-msgstr "Unknown command."
+msgid "Unregistered ID."
+msgstr "Unregistered ID"
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Unknown error"
-
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
-msgid "Unknown command."
-msgstr "Unknown command."
+msgid "Wrong password."
+msgstr "Wrong password"
 
-#: ../src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
-msgid "Unknown connection error."
-msgstr "Unknown connection error"
-
-#: ../src/net/manaserv/charhandler.cpp:208
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Unknown error"
+msgid "Account expired."
+msgstr "Account expired"
 
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
-msgid "Unknown error."
-msgstr "Unknown error"
+msgid "Rejected from server."
+msgstr "Rejected from server"
 
-#: ../src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
-msgid "Unknown guild invite response."
-msgstr "Unknown invite response for %s."
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"You have been permanently banned from the game. Please contact the GM Team."
 
-#: ../src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
-msgid "Unknown invite response for %s."
-msgstr "Unknown invite response for %s."
-
-#: ../src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Unknown item"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
 
-#: ../src/localplayer.cpp:1258
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
-msgid "Unknown problem picking up item."
-msgstr "Unable to pick up item."
+msgid "This user name is already taken."
+msgstr "This user name is already taken"
 
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Unregister"
+#: src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#: ../src/client.cpp:926
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
-msgid "Unregister Successful"
-msgstr "Unregister"
+msgid "Unable to resolve host \""
+msgstr "Unable to sell."
 
-#: ../src/net/tmwa/loginhandler.cpp:156
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
-msgid "Unregistered ID."
-msgstr "Unregistered ID"
+msgid "Connection to server terminated. "
+msgstr "Connecting to map server..."
 
-#: ../src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Up"
+#: src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Could not create party."
 
-#: ../src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Updating..."
+#: src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Party successfully created."
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
-msgid "Use"
-msgstr "Use"
+#: src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s is already a member of a party."
 
-#: ../src/net/tmwa/guildhandler.cpp:305
-#, fuzzy
-msgid "User is now part of your guild."
-msgstr "%s is now a member of your party."
+#: src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s refused your invitation."
 
-#: ../src/net/tmwa/guildhandler.cpp:300
-msgid "User rejected guild invite."
-msgstr ""
+#: src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s is now a member of your party."
 
-#: ../src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Username already exists"
+#: src/net/tmwa/partyhandler.cpp:131
+#, c-format
+msgid "Unknown invite response for %s."
+msgstr "Unknown invite response for %s."
 
-#: ../src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Video"
+#: src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "You have left the party."
 
-#: ../src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Visible names"
+#: src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s has left your party."
 
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Vitality"
+#: src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "An unknown member tried to say: %s"
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
+#: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Vitality %+d"
-msgstr "Vitality %+d"
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Vitality:"
+#: src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
+msgstr ""
 
-#: ../src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "Waiting for server"
+#: src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s is not in your party!"
 
-#: ../src/gui/serverdialog.cpp:448
-#, fuzzy
-msgid "Waiting for server..."
-msgstr "Waiting for server"
+#: src/net/tmwa/playerhandler.cpp:100
+msgid "Insert coin to continue."
+msgstr "Insert coin to continue."
 
-#: ../src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "Warp failed..."
+#: src/net/tmwa/playerhandler.cpp:118
+msgid "You're not dead yet. You're just resting."
+msgstr "You're not dead yet. You're just resting."
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "We regret to inform you that your character was killed in battle."
+#: src/net/tmwa/playerhandler.cpp:119
+msgid "You are no more."
+msgstr "You are no more."
 
-#: ../src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:120
+msgid "You have ceased to be."
+msgstr "You have ceased to be."
 
-#: ../src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Weight:"
+#: src/net/tmwa/playerhandler.cpp:121
+msgid "You've expired and gone to meet your maker."
+msgstr "You've expired and gone to meet your maker."
 
-#: ../src/gui/itempopup.cpp:126
-#, fuzzy, c-format
-msgid "Weight: %s"
-msgstr "Weight: "
+#: src/net/tmwa/playerhandler.cpp:122
+msgid "You're a stiff."
+msgstr "You're a stiff."
 
-#: ../src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "When ignoring:"
+#: src/net/tmwa/playerhandler.cpp:123
+msgid "Bereft of life, you rest in peace."
+msgstr "Bereft of life, you rest in peace."
 
-#: ../src/gui/popupmenu.cpp:91
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "Whisper"
+#: src/net/tmwa/playerhandler.cpp:124
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "If you weren't so animated, you'd be pushing up the daisies."
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/playerhandler.cpp:125
+msgid "Your metabolic processes are now history."
+msgstr "Your metabolic processes are now history."
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "Whisper could not be sent, user is offline."
+#: src/net/tmwa/playerhandler.cpp:126
+msgid "You're off the twig."
+msgstr "You're off the twig."
 
-#: ../src/gui/chat.cpp:452
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Whispering to %s: %s"
+#: src/net/tmwa/playerhandler.cpp:127
+msgid "You've kicked the bucket."
+msgstr "You've kicked the bucket."
 
-#: ../src/gui/socialwindow.cpp:158
-#, c-format
-msgid "Who would you like to invite to guild %s?"
+#: src/net/tmwa/playerhandler.cpp:128
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
 msgstr ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
 
-#: ../src/gui/socialwindow.cpp:237
-#, c-format
-msgid "Who would you like to invite to party %s?"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:130
+msgid "You are an ex-player."
+msgstr "You are an ex-player."
 
-#: ../src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Willpower:"
+#: src/net/tmwa/playerhandler.cpp:131
+msgid "You're pining for the fjords."
+msgstr "You're pining for the fjords."
 
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "Willpower %+d"
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
+msgid "Message"
+msgstr "Message"
 
-#: ../src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Wrong magic_token"
+#: src/net/tmwa/playerhandler.cpp:247
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"You are carrying more than half your maximum load. You are unable to "
+"automatically regain health."
 
-#: ../src/net/tmwa/loginhandler.cpp:159
-#, fuzzy
-msgid "Wrong password."
-msgstr "Wrong password"
+#: src/net/tmwa/playerhandler.cpp:313
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "You picked up "
 
-#: ../src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Wrong username or password"
+#: src/net/tmwa/playerhandler.cpp:348
+msgid "Cannot raise skill!"
+msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Wrong username, password or email address"
+#: src/net/tmwa/playerhandler.cpp:488
+msgid "Equip arrows first."
+msgstr "Equip arrows first."
 
-#: ../src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Yes"
+#: src/net/tmwa/specialhandler.cpp:144
+msgid "Trade failed!"
+msgstr "Trade failed!"
 
-#: ../src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "You died"
+#: src/net/tmwa/specialhandler.cpp:147
+msgid "Emote failed!"
+msgstr "Emote failed!"
 
-#: ../src/net/tmwa/playerhandler.cpp:139
-msgid "You are an ex-player."
-msgstr "You are an ex-player."
+#: src/net/tmwa/specialhandler.cpp:150
+msgid "Sit failed!"
+msgstr "Sit failed!"
 
-#: ../src/net/tmwa/playerhandler.cpp:257
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"You are carrying more than half your maximum load. You are unable to "
-"automatically regain health."
+#: src/net/tmwa/specialhandler.cpp:153
+msgid "Chat creating failed!"
+msgstr "Failed to create channel!"
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "You are dead."
+#: src/net/tmwa/specialhandler.cpp:156
+msgid "Could not join party!"
+msgstr "Could not join party!"
 
-#: ../src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "You are no more."
+#: src/net/tmwa/specialhandler.cpp:159
+msgid "Cannot shout!"
+msgstr "Can not shout!"
 
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "You are not that alive anymore."
+#: src/net/tmwa/specialhandler.cpp:168
+msgid "You have not yet reached a high enough lvl!"
+msgstr "You have not yet reached a high enough level!"
 
-#: ../src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:171
+msgid "Insufficient HP!"
+msgstr "Insufficient HP!"
+
+#: src/net/tmwa/specialhandler.cpp:174
+msgid "Insufficient SP!"
+msgstr "Insufficient SP!"
+
+#: src/net/tmwa/specialhandler.cpp:177
+msgid "You have no memos!"
+msgstr "You have no memos!"
 
-#: ../src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "You can not do that right now!"
 
-#: ../src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:183
+msgid "Seems you need more money... ;-)"
+msgstr "Seems you need more money... ;-)"
+
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "You cannot use this skill with that kind of weapon!"
 
-#: ../src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "You don't have enough money."
-
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
-#, fuzzy, c-format
-msgid "You get %s"
-msgstr "You get %s."
+#: src/net/tmwa/specialhandler.cpp:189
+msgid "You need another red gem!"
+msgstr "You need another red gem!"
 
-#: ../src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "You give:"
+#: src/net/tmwa/specialhandler.cpp:192
+msgid "You need another blue gem!"
+msgstr "You need another blue gem!"
 
-#: ../src/gui/socialwindow.cpp:592
-#, fuzzy, c-format
-msgid "You have been invited to join the %s party."
-msgstr "%s has invited you to join the %s party."
+#: src/net/tmwa/specialhandler.cpp:195
+msgid "You're carrying to much to do this!"
+msgstr "You're carrying to much to do this!"
 
-#: ../src/gui/socialwindow.cpp:588
-#, fuzzy
-msgid "You have been invited you to join a party."
-msgstr "%s has invited you to join their party."
+#: src/net/tmwa/specialhandler.cpp:198
+msgid "Huh? What's that?"
+msgstr "Huh? What's that?"
 
-#: ../src/net/tmwa/loginhandler.cpp:168
-#, fuzzy
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"You have been permanently banned from the game. Please contact the GM Team."
+#: src/net/tmwa/specialhandler.cpp:207
+msgid "Warp failed..."
+msgstr "Warp failed..."
 
-#: ../src/net/tmwa/loginhandler.cpp:172
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
-msgstr ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
+#: src/net/tmwa/specialhandler.cpp:210
+msgid "Could not steal anything..."
+msgstr "Could not steal anything..."
 
-#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "You have ceased to be."
+#: src/net/tmwa/specialhandler.cpp:213
+msgid "Poison had no effect..."
+msgstr "Poison had no effect..."
 
-#: ../src/net/tmwa/partyhandler.cpp:241
-msgid "You have left the party."
-msgstr "You have left the party."
+#: src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Trading isn't possible. Trade partner is too far away."
 
-#: ../src/net/tmwa/specialhandler.cpp:180
-msgid "You have no memos!"
-msgstr "You have no memos!"
+#: src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Trading isn't possible. Character doesn't exist."
 
-#: ../src/net/tmwa/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "You have not yet reached a high enough level!"
+#: src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Trade cancelled due to an unknown reason."
 
-#: ../src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Trade: You and %s"
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Trade with %s cancelled."
 
-#: ../src/net/tmwa/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "You need another blue gem!"
+#: src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr "Unhandled trade cancel packet."
 
-#: ../src/net/tmwa/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "You need another red gem!"
+#: src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Failed to add item. Trade partner is over weighted."
 
-#: ../src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Failed to add item. Trade partner has no free slot."
 
-#: ../src/localplayer.cpp:1276
-#, fuzzy, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "You picked up %s [@@%d|%s@@]."
-msgstr[1] "You picked up %s [@@%d|%s@@]."
+#: src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Failed to add item for unknown reason."
 
-#: ../src/net/tmwa/playerhandler.cpp:344
-#, fuzzy, c-format
-msgid "You picked up %s."
-msgstr "You picked up "
+#: src/playerrelations.cpp:310
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|Completely ignore %s@@"
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
-"You screwed up again, dump your body down the tubes and get yourself another "
-"one."
 
-#: ../src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "You're a stiff."
-
-#: ../src/net/tmwa/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "You're carrying to much to do this!"
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "Attack %+d"
 
-#: ../src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "You're not dead yet. You're just resting."
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "Defense %+d"
 
-#: ../src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
-msgstr "You're off the twig."
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: ../src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr "You're pining for the fjords."
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: ../src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "You've expired and gone to meet your maker."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Unknown item"
 
-#: ../src/net/tmwa/playerhandler.cpp:136
-msgid "You've kicked the bucket."
-msgstr "You've kicked the bucket."
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "unnamed"
 
-#: ../src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: ../src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
-msgstr ""
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: ../src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "Your metabolic processes are now history."
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: ../src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Your name needs to be at least 4 characters."
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Money: %d"
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Your plan of breaking your enemy's weapon by bashing it with your throat "
-"failed."
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Job:"
 
-#: ../src/gui/setup_video.cpp:233
-msgid "as particle"
-msgstr "as particle"
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Level: %d"
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "high"
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "Access denied"
 
-#: ../src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "in chat"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Unknown failure to select character"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "low"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Inviting like this isn't supported at the moment."
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr ""
+#~ msgid "Willpower:"
+#~ msgstr "Willpower:"
 
-#: ../src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "max"
+#~ msgid "Willpower %+d"
+#~ msgstr "Willpower %+d"
 
-#: ../src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "medium"
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Willpower:"
 
-#: ../src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "off"
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "Server is full"
 
-#: ../src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr ""
+#~ msgid "Text Shadow"
+#~ msgstr "Text Shadow"
 
-#: ../src/gui/serverdialog.cpp:558
-#, c-format
-msgid "requires v%s"
-msgstr ""
+#~ msgid "Text Outline"
+#~ msgstr "Text Outline"
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
-msgid "unnamed"
-msgstr "unnamed"
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Progress Bar Labels"
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " can't be created, but it doesn't exist! Exiting."
+#~ msgid "Background"
+#~ msgstr "Background"
 
-#~ msgid " host: "
-#~ msgstr " host: "
+#~ msgid "Highlight"
+#~ msgstr "Highlight"
 
-#~ msgid " video mode: "
-#~ msgstr " video mode: "
+#~ msgid "Tab Highlight"
+#~ msgstr "Tab Highlight"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Reflex:"
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Item too expensive"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Alias of create"
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Item is equipped"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 HP Bar"
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 HP Bar"
+#~ msgid "Player"
+#~ msgstr "Player"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "2 Handed Weapons"
+#~ msgid "Whisper"
+#~ msgstr "Whisper"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 HP Bar"
+#~ msgid "Is"
+#~ msgstr "Is"
 
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Kick player@@"
+#~ msgid "Server"
+#~ msgstr "Server"
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Attack %s@@"
+#~ msgid "Logger"
+#~ msgstr "Logger"
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Cancel@@"
+#~ msgid "Hyperlink"
+#~ msgstr "Hyperlink"
 
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|Disregard %s@@"
+#~ msgid "Being"
+#~ msgstr "Being"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Drop@@"
+#~ msgid "Other Players' Names"
+#~ msgstr "Other Players' Names"
 
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|Ignore %s@@"
+#~ msgid "Own Name"
+#~ msgstr "Own Name"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Pick Up %s@@"
+#~ msgid "GM Names"
+#~ msgstr "GM Names"
 
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|Pick up %s@@"
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
 
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|Retrieve@@"
+#~ msgid "Monsters"
+#~ msgstr "Monsters"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Split@@"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Unknown Item Type"
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Store@@"
+#~ msgid "Generics"
+#~ msgstr "Generics"
 
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Trade With %s@@"
+#~ msgid "Hats"
+#~ msgstr "Hats"
 
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Un-Ignore %s@@"
+#~ msgid "Usables"
+#~ msgstr "Usables"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Equip@@"
+#~ msgid "Shirts"
+#~ msgstr "Shirts"
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Unequip@@"
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "1 Handed Weapons"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Use@@"
+#~ msgid "Shoes"
+#~ msgstr "Shoes"
 
 #, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Access denied"
+#~ msgid "Two Handed Weapons"
+#~ msgstr "1 Handed Weapons"
 
-#~ msgid "Ammo"
-#~ msgstr "Ammunition"
+#~ msgid "Shields"
+#~ msgstr "Shields"
+
+#~ msgid "Rings"
+#~ msgstr "Rings"
+
+#~ msgid "Necklaces"
+#~ msgstr "Necklaces"
 
 #~ msgid "Arms"
 #~ msgstr "Arms"
 
-#~ msgid "Attack:"
-#~ msgstr "Attack:"
+#~ msgid "Ammo"
+#~ msgstr "Ammunition"
 
-#~ msgid "Axe"
-#~ msgstr "Axe"
+#~ msgid "Particle Effects"
+#~ msgstr "Particle Effects"
 
-#~ msgid "Background"
-#~ msgstr "Background"
+#~ msgid "Pickup Notification"
+#~ msgstr "Pickup Notification"
 
-#~ msgid "Bow"
-#~ msgstr "Bow"
+#~ msgid "Exp Notification"
+#~ msgstr "Exp Notification"
 
-#~ msgid "Buddy"
-#~ msgstr "Friend"
-
-#~ msgid "Buddy List"
-#~ msgstr "Friend list"
-
-#~ msgid "Buddys"
-#~ msgstr "Buddys"
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Player hits Monster"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Cast Test Spell 1"
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monster hits Player"
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Cast Test Spell 2"
+#~ msgid "Critical Hit"
+#~ msgstr "Critical Hit"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Cast Test Spell 3"
+#~ msgid "Misses"
+#~ msgstr "Misses"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Command: /new <party-name>"
+#~ msgid "HP Bar"
+#~ msgstr "HP Bar"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Connecting to account server..."
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 HP Bar"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Connecting to character server..."
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 HP Bar"
 
-#~ msgid "Cost"
-#~ msgstr "Cost"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 HP Bar"
 
-#~ msgid "Couldn't set "
-#~ msgstr "Couldn't set "
+#~ msgid "no"
+#~ msgstr "No"
 
-#~ msgid "Craft"
-#~ msgstr "Craft"
+#~ msgid "Buddy"
+#~ msgstr "Friend"
 
-#~ msgid "Crafts"
-#~ msgstr "Crafts"
+#~ msgid "Buddy List"
+#~ msgstr "Friend list"
 
 #~ msgid "Description: %s"
 #~ msgstr "Description: %s"
@@ -3938,202 +3811,218 @@ msgstr "unnamed"
 #~ msgid "Effect: %s"
 #~ msgstr "Effect: %s"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Failed to switch to "
+#~ msgid "Previous"
+#~ msgstr "Previous"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#~ msgid "New"
+#~ msgstr "New"
 
-#~ msgid "Generics"
-#~ msgstr "Generics"
+#~ msgid "Job Level: %d"
+#~ msgstr "Job Level: %d"
 
-#~ msgid "Guilds"
-#~ msgstr "Guilds"
+#~ msgid "Present: "
+#~ msgstr "Present: "
 
-#~ msgid "HP Bar"
-#~ msgstr "HP Bar"
+#~ msgid "Quit Guild"
+#~ msgstr "Quit Guild"
 
-#~ msgid "Hats"
-#~ msgstr "Hats"
+#~ msgid "Ok"
+#~ msgstr "Ok"
 
-#~ msgid "Highlight"
-#~ msgstr "Highlight"
+#~ msgid "Recent:"
+#~ msgstr "Recent:"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Hyperlink"
+#~ msgid "Magic"
+#~ msgstr "Magic"
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Inviting like this isn't supported at the moment."
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Cast Test Spell 1"
 
-#~ msgid "Is"
-#~ msgstr "Is"
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Cast Test Spell 2"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Item is equipped"
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Cast Test Spell 3"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Item too expensive"
+#~ msgid "2 Handed Weapons"
+#~ msgstr "2 Handed Weapons"
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Job Level: %d"
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Trade With %s@@"
 
-#~ msgid "Knife"
-#~ msgstr "Knife"
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Attack %s@@"
 
-#~ msgid "Logger"
-#~ msgstr "Logger"
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Disregard %s@@"
 
-#~ msgid "Mace"
-#~ msgstr "Mace"
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignore %s@@"
 
-#~ msgid "Magic"
-#~ msgstr "Magic"
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Un-Ignore %s@@"
 
-#~ msgid "Max level"
-#~ msgstr "Max level"
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Kick player@@"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Mystery Skill"
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancel@@"
 
-#~ msgid "Necklaces"
-#~ msgstr "Necklaces"
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Pick up %s@@"
 
-#~ msgid "New"
-#~ msgstr "New"
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Unequip@@"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Equip@@"
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "1 Handed Weapons"
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Use@@"
 
-#~ msgid "Party Window"
-#~ msgstr "Party Window"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Drop@@"
 
-#~ msgid "Player"
-#~ msgstr "Player"
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Split@@"
 
-#~ msgid "Polearm"
-#~ msgstr "Polearm"
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Store@@"
 
-#~ msgid "Present: "
-#~ msgstr "Present: "
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Retrieve@@"
 
-#~ msgid "Previous"
-#~ msgstr "Previous"
+#~ msgid "Select Server"
+#~ msgstr "Select Server"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Progress Bar Labels"
+#~ msgid "Failed to switch to "
+#~ msgstr "Failed to switch to "
 
-#~ msgid "Quit Guild"
-#~ msgstr "Quit Guild"
+#~ msgid "windowed"
+#~ msgstr "windowed"
 
-#~ msgid "Recent:"
-#~ msgstr "Recent:"
+#~ msgid "fullscreen"
+#~ msgstr "fullscreen"
+
+#~ msgid "Mystery Skill"
+#~ msgstr "Mystery Skill"
+
+#~ msgid "Weapons"
+#~ msgstr "Weapons"
+
+#~ msgid "Crafts"
+#~ msgstr "Crafts"
+
+#~ msgid "Stats"
+#~ msgstr "Stats"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Cost"
+#~ msgstr "Cost"
+
+#~ msgid "Attack:"
+#~ msgstr "Attack:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% Reflex:"
 
 #~ msgid "Remaining Status Points: %d"
 #~ msgstr "Remaining Status Points: %d"
 
-#~ msgid "Rings"
-#~ msgstr "Rings"
+#~ msgid "Max level"
+#~ msgstr "Max level"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Scroll laziness"
+#~ msgid "curl error "
+#~ msgstr "curl error "
 
-#~ msgid "Scroll radius"
-#~ msgstr "Scroll radius"
+#~ msgid " host: "
+#~ msgstr " host: "
 
-#~ msgid "Select Server"
-#~ msgstr "Select Server"
+#~ msgid "Guilds"
+#~ msgstr "Guilds"
 
-#~ msgid "Server"
-#~ msgstr "Server"
+#~ msgid "Buddys"
+#~ msgstr "Buddys"
 
-#~ msgid "Shields"
-#~ msgstr "Shields"
+#~ msgid "Party Window"
+#~ msgstr "Party Window"
 
-#~ msgid "Shirts"
-#~ msgstr "Shirts"
+#~ msgid "Unarmed"
+#~ msgstr "Unarmed"
 
-#~ msgid "Shoes"
-#~ msgstr "Shoes"
+#~ msgid "Knife"
+#~ msgstr "Knife"
 
-#~ msgid "Shooting"
-#~ msgstr "Shooting"
+#~ msgid "Sword"
+#~ msgstr "Sword"
+
+#~ msgid "Polearm"
+#~ msgstr "Polearm"
 
 #~ msgid "Staff"
 #~ msgstr "Staff"
 
-#~ msgid "Stats"
-#~ msgstr "Stats"
+#~ msgid "Whip"
+#~ msgstr "Whip"
 
-#~ msgid "Sword"
-#~ msgstr "Sword"
+#~ msgid "Bow"
+#~ msgstr "Bow"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Tab Highlight"
+#~ msgid "Shooting"
+#~ msgstr "Shooting"
 
-#~ msgid "Text Outline"
-#~ msgstr "Text Outline"
+#~ msgid "Mace"
+#~ msgstr "Mace"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Text Shadow"
+#~ msgid "Axe"
+#~ msgstr "Axe"
 
 #~ msgid "Thrown"
 #~ msgstr "Thrown"
 
-#~ msgid "Total"
-#~ msgstr "Total"
-
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "1 Handed Weapons"
-
-#~ msgid "Unarmed"
-#~ msgstr "Unarmed"
+#~ msgid "Craft"
+#~ msgstr "Craft"
 
 #~ msgid "Unknown Skill"
 #~ msgstr "Unknown Skill"
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Unknown failure to select character"
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " can't be created, but it doesn't exist! Exiting."
 
-#~ msgid "Unnamed"
-#~ msgstr "Unnamed"
+#~ msgid "Couldn't set "
+#~ msgstr "Couldn't set "
 
-#~ msgid "Usables"
-#~ msgstr "Usables"
+#~ msgid " video mode: "
+#~ msgstr " video mode: "
 
-#~ msgid "Weapons"
-#~ msgstr "Weapons"
+#~ msgid "mana"
+#~ msgstr "mana"
 
-#~ msgid "Whip"
-#~ msgstr "Whip"
+#~ msgid "Connecting to character server..."
+#~ msgstr "Connecting to character server..."
 
-#~ msgid "Whisper"
-#~ msgstr "Whisper"
+#~ msgid "Connecting to account server..."
+#~ msgstr "Connecting to account server..."
 
-#~ msgid "Willpower:"
-#~ msgstr "Willpower:"
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Alias of create"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Command: /new <party-name>"
 
 #~ msgid "a"
 #~ msgstr "a"
 
-#~ msgid "curl error "
-#~ msgstr "curl error "
-
-#~ msgid "fullscreen"
-#~ msgstr "fullscreen"
+#~ msgid "Unnamed"
+#~ msgstr "Unnamed"
 
-#~ msgid "mana"
-#~ msgstr "mana"
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@pickup|Pick Up %s@@"
 
-#~ msgid "no"
-#~ msgstr "No"
+#~ msgid "Scroll radius"
+#~ msgstr "Scroll radius"
 
-#~ msgid "windowed"
-#~ msgstr "windowed"
+#~ msgid "Scroll laziness"
+#~ msgstr "Scroll laziness"
diff --git a/po/eo.po b/po/eo.po
index 9e0c1c0b..881cd6e3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-09-10 13:30+0000\n"
 "Last-Translator: Yamiharu <yamiharu84@gmail.com>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -19,468 +19,448 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "--Helpo--"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Tiu komando monstras la liston de uzeblaj komandoj"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:274
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -489,40 +469,40 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "La mapo ne sxa"
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -536,34 +516,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -577,11 +557,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -654,14 +634,14 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -676,8 +656,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -732,8 +712,8 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
@@ -741,24 +721,24 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -824,8 +804,8 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
@@ -833,7 +813,7 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
@@ -845,80 +825,83 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -947,40 +930,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -994,7 +977,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1080,7 +1063,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1152,56 +1135,56 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1238,50 +1221,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1365,27 +1348,31 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1441,484 +1428,457 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Ĉu vi vere volas fini la programon?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Ĉu vi vere volas fini la programon?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-msgid "Level"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1957,78 +1917,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2105,53 +1993,53 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2175,478 +2063,491 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2723,11 +2624,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2737,186 +2638,134 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2929,70 +2778,115 @@ msgstr ""
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3037,27 +2931,27 @@ msgstr ""
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3133,15 +3027,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3149,15 +3043,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3165,15 +3059,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3229,7 +3123,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3237,242 +3131,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3488,52 +3377,43 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr "sennoma"
 
diff --git a/po/es.po b/po/es.po
index 8e9b620b..3a1cab8d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-09 22:27+0100\n"
 "PO-Revision-Date: 2010-12-23 12:08+0100\n"
 "Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
 "Language-Team: Spanish Translator <natsuki.sumon@gmail.com>\n"
@@ -21,396 +21,343 @@ msgstr ""
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-Country: SPAIN\n"
 
-#: ../src/gui/npcdialog.cpp:183
-msgid ""
-"\n"
-"> Next\n"
-msgstr ""
-"\n"
-"> Siguiente\n"
-
-#: ../src/main.cpp:60
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "     --no-opengl      :  Deshabilita OpenGL en esta sesion"
-
-#: ../src/main.cpp:58
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Carpeta donde guardar los screenshots"
-
-#: ../src/main.cpp:52
-msgid "     --update-host    : Use this update host"
-msgstr "     --update-host    : Usar este host de actualización"
-
-#: ../src/main.cpp:46
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Carpeta de Configuración a usar"
-
-#: ../src/main.cpp:53
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Escoje el personaje por defecto y el servidor"
-
-#: ../src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
-
-#: ../src/main.cpp:48
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Acceder con la contraseña"
-
-#: ../src/main.cpp:47
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Acceder con este nombre de usuario"
-
-#: ../src/main.cpp:49
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Acceder con este jugador"
-
-#: ../src/main.cpp:56
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Carpeta por donde cargar los datos del juego"
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Configuración"
 
-#: ../src/main.cpp:45
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Muestra la ayuda"
+#: src/client.cpp:625
+msgid "Connecting to server"
+msgstr "Conectando al servidor"
 
-#: ../src/main.cpp:51
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Puerto del servidor"
+#: src/client.cpp:652
+msgid "Logging in"
+msgstr "Acediendo a la cuenta"
 
-#: ../src/main.cpp:50
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         :  Login server o IP"
+#: src/client.cpp:685
+msgid "Entering game world"
+msgstr "Entrando al juego"
 
-#: ../src/main.cpp:55
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Saltarse las actualizaciones"
+#: src/client.cpp:741
+msgid "Requesting characters"
+msgstr "Cargando jugadores"
 
-#: ../src/main.cpp:44
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        :  Muestra la versión"
+#: src/client.cpp:770
+msgid "Connecting to the game server"
+msgstr "Conectando al servidor del juego"
 
-#: ../src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1 Es altamente recomendado que"
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Error"
 
-#: ../src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##3  El proceso de actualización esta incompleto."
+#: src/client.cpp:817
+msgid "Requesting registration details"
+msgstr "Detalles de registración"
 
-#: ../src/gui/updatewindow.cpp:421
-msgid "##1  you try again later."
-msgstr "##1 lo intentes de nuevo más tarde."
+#: src/client.cpp:844
+msgid "Password Change"
+msgstr "Cambiar contraseña"
 
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Puntería"
+#: src/client.cpp:845
+msgid "Password changed successfully!"
+msgstr "Le contraseña se cambió correctamente!"
 
-#: ../src/net/tmwa/generalhandler.cpp:230
-#, c-format
-msgid "% Critical"
-msgstr "% Crítico"
+#: src/client.cpp:864
+msgid "Email Change"
+msgstr "Cambiar e-mail"
 
-#: ../src/net/tmwa/generalhandler.cpp:229
-#, c-format
-msgid "% Evade"
-msgstr "% Evasión"
+#: src/client.cpp:865
+msgid "Email changed successfully!"
+msgstr "Email modificado correctamente!"
 
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr "%d FPS"
+#: src/client.cpp:885
+msgid "Unregister Successful"
+msgstr "Registro cancelado"
 
-#: ../src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
-msgstr "%d FPS (OpenGL)"
+#: src/client.cpp:886
+msgid "Farewell, come back any time..."
+msgstr "Adiós, vuelve cuando quieras..."
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s no existe y no puede ser creado! Saliendo."
 
-#: ../src/net/manaserv/chathandler.cpp:291
+#: src/client.cpp:1121
 #, c-format
-msgid "%s entered the channel."
-msgstr "%s entró al canal."
+msgid "Invalid update host: %s"
+msgstr "Host de actualización inválido: %s"
 
-#: ../src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s te ha invitado para unirte al grupo %s."
+#: src/client.cpp:1155 src/client.cpp:1161
+msgid "Error creating updates directory!"
+msgstr "Error creando la carpeta de actualizaciones!"
 
-#: ../src/gui/socialwindow.cpp:561
-#, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s te ha invitado al clan %s."
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+msgid "Unknown command."
+msgstr "Comando desconocido."
 
-#: ../src/gui/socialwindow.cpp:600
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s te ha invitado a unirte a su grupo."
+#: src/commandhandler.cpp:156
+msgid "-- Help --"
+msgstr "--Ayuda--"
 
-#: ../src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s expulsó a %s."
+#: src/commandhandler.cpp:157
+msgid "/help > Display this help"
+msgstr "/help > Muestra esta ayuda"
 
-#: ../src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s dejó tu grupo."
+#: src/commandhandler.cpp:159
+msgid "/where > Display map name"
+msgstr "/where > Muestra el nombre del mapa"
 
-#: ../src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s colocó en el modo %s al usuario %s."
+#: src/commandhandler.cpp:160
+msgid "/who > Display number of online users"
+msgstr "/who > Muestra el número de jugadores on-line"
 
-#: ../src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s ya es miembro de otro grupo."
+#: src/commandhandler.cpp:161
+msgid "/me > Tell something about yourself"
+msgstr "/me > Para decir algo sobre ti"
 
-#: ../src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s no está en tu grupo!"
+#: src/commandhandler.cpp:163
+msgid "/clear > Clears this window"
+msgstr "/clear > Limpia esta ventana"
 
-#: ../src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s ahora es un miembro de tu grupo."
+#: src/commandhandler.cpp:165
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Envia un mensaje privado a este jugador"
 
-#: ../src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s ha entrado a formar parte del grupo."
+#: src/commandhandler.cpp:166
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Lo mismo que /msg"
 
-#: ../src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr "%s dejó el canal."
+#: src/commandhandler.cpp:167
+msgid "/w > Alias of msg"
+msgstr "/w > Lo mismo que /msg"
 
-#: ../src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s cancelo tu invitación."
+#: src/commandhandler.cpp:168
+msgid "/query > Makes a tab for private messages with another user"
+msgstr "/query > Abre una pestaña de mensajes con otro jugador"
 
-#: ../src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s canceló tu invitación."
+#: src/commandhandler.cpp:169
+msgid "/q > Alias of query"
+msgstr "/q > Lo mismo que /query"
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s quiere comerciar contigo, aceptas?"
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
 
-#: ../src/gui/widgets/chattab.cpp:152
-#, c-format
-msgid "%s whispers: %s"
-msgstr "%s envía mensaje privado: %s"
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr "/unignore > Deja de ignorar un jugador"
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
-msgid "(empty)"
-msgstr "(vacío)"
+#: src/commandhandler.cpp:174
+msgid "/list > Display all public channels"
+msgstr "/list > Muestra todos los canales públicos"
 
-#: ../src/commandhandler.cpp:222
-msgid "*** only available to a GM ***"
-msgstr "*** Disponible solo para GMs ***"
+#: src/commandhandler.cpp:175
+msgid "/join > Join or create a channel"
+msgstr "/join > Unirse o crear un canal"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
-msgid "+"
-msgstr "+"
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr "/createparty > Crear un nuevo grupo"
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
-msgid "-"
-msgstr "-"
+#: src/commandhandler.cpp:178
+msgid "/party > Invite a user to party"
+msgstr "/party > Invitar un jugador al grupo"
 
-#: ../src/commandhandler.cpp:166
-msgid "-- Help --"
-msgstr "--Ayuda--"
+#: src/commandhandler.cpp:180
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Comenzar a guardar el chat en un archivo externo"
+
+#: src/commandhandler.cpp:181
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr "/toggle > Determina si <enter> muestra/esconde el chat"
 
-#: ../src/commandhandler.cpp:201
+#: src/commandhandler.cpp:182
+msgid "/present > Get list of players present (sent to chat log, if logging)"
+msgstr ""
+"/present > Muestra la lista de jugadores presentes (enviar al log del chat)"
+
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Anuncio Global (Solo GMs)"
 
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr "/away > Les dice a los otros que estas fuera del PC mensaje privado ."
-
-#: ../src/commandhandler.cpp:173
-msgid "/clear > Clears this window"
-msgstr "/clear > Limpia esta ventana"
+#: src/commandhandler.cpp:188
+msgid "For more information, type /help <command>."
+msgstr "Para mas informacion,  pon /help <comando>."
 
-#: ../src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Cierra la pestaña de mensajes"
+#: src/commandhandler.cpp:192
+msgid "Command: /help"
+msgstr "Comando: /help"
 
-#: ../src/commandhandler.cpp:191
-msgid "/createparty > Create a new party"
-msgstr "/createparty > Crear un nuevo grupo"
+#: src/commandhandler.cpp:193
+msgid "This command displays a list of all commands available."
+msgstr "Para ver la lista de comandos disponibles."
 
-#: ../src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Mostrar/Modificar el compartir experiencia en el grupo "
+#: src/commandhandler.cpp:194
+msgid "Command: /help <command>"
+msgstr "Comando: /help <comando>"
 
-#: ../src/commandhandler.cpp:167
-msgid "/help > Display this help"
-msgstr "/help > Muestra esta ayuda"
+#: src/commandhandler.cpp:195
+msgid "This command displays help on <command>."
+msgstr "Para ver la ayuda en <comando>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Para la ayuda."
+#: src/commandhandler.cpp:203
+msgid "Command: /announce <msg>"
+msgstr "Comando: /announce <mensaje>"
 
-#: ../src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
-msgstr "/ignore > Ignora al jugador"
+#: src/commandhandler.cpp:204
+msgid "*** only available to a GM ***"
+msgstr "*** Disponible solo para GMs ***"
 
-#: ../src/commandhandler.cpp:185
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
+#: src/commandhandler.cpp:205
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+"Este comando envía un mensaje <mensaje> para todos los jugadores online."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invita un jugador a tu clan"
+#: src/commandhandler.cpp:210
+msgid "Command: /clear"
+msgstr "Comando: /clear"
 
-#: ../src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Invita un jugador a tu grupo"
+#: src/commandhandler.cpp:211
+msgid "This command clears the chat log of previous chat."
+msgstr "Este comando limpia la pestaña actual del chat previo."
 
-#: ../src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > Mostrar/Cambiar el compartir objetos en el grupo"
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr "Comando: /ignore <jugador>"
 
-#: ../src/commandhandler.cpp:189
-msgid "/join > Join or create a channel"
-msgstr "/join > Unirse o crear un canal"
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+"Este comando es para ignorar al jugador indicado, independientemente de la "
+"relación actual."
 
-#: ../src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Expulsar un usuario del canal"
+#: src/commandhandler.cpp:221
+msgid "Command: /join <channel>"
+msgstr "Comando: /join <canal>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Expulsa a alguien del clan en el que estás."
+#: src/commandhandler.cpp:222
+msgid "This command makes you enter <channel>."
+msgstr "Este comando te hace entrar en <canal>."
 
-#: ../src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Expulsa a alguien del grupo en el que estás"
+#: src/commandhandler.cpp:223
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Si el  <canal> no existe, sera creado."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Deja el clan en la que estas"
+#: src/commandhandler.cpp:227
+msgid "Command: /list"
+msgstr "Comando: /list"
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Salir del grupo en el que estás"
+#: src/commandhandler.cpp:228
+msgid "This command shows a list of all channels."
+msgstr "Este comando muestra una lista con todos los canales."
 
-#: ../src/commandhandler.cpp:188
-msgid "/list > Display all public channels"
-msgstr "/list > Muestra todos los canales públicos"
+#: src/commandhandler.cpp:232
+msgid "Command: /me <message>"
+msgstr "Comando: /me <mensaje>"
 
-#: ../src/commandhandler.cpp:171
-msgid "/me > Tell something about yourself"
-msgstr "/me > Para decir algo sobre ti"
+#: src/commandhandler.cpp:233
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Este comando muestra a los otros lo que tú estas (haciendo) <mensaje>."
 
-#: ../src/commandhandler.cpp:175
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Envia un mensaje privado a este jugador"
+#: src/commandhandler.cpp:237
+msgid "Command: /msg <nick> <message>"
+msgstr "Comando: /msg <nick> <mensaje>"
 
-#: ../src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Hacer a un usuario operador del canal"
+#: src/commandhandler.cpp:238
+msgid "Command: /whisper <nick> <message>"
+msgstr "Comando: /whisper <nick> <mensaje>"
 
-#: ../src/commandhandler.cpp:192
-msgid "/party > Invite a user to party"
-msgstr "/party > Invitar un jugador al grupo"
+#: src/commandhandler.cpp:239
+msgid "Command: /w <nick> <message>"
+msgstr "Comando: /w <nick> <mensaje>"
 
-#: ../src/commandhandler.cpp:198
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Muestra la lista de jugadores presentes (enviar al log del chat)"
+#: src/commandhandler.cpp:240
+msgid "This command sends the text <message> to <nick>."
+msgstr "Este comando envía el texto <mensaje> para el jugador <nick>."
 
-#: ../src/commandhandler.cpp:180
-msgid "/q > Alias of query"
-msgstr "/q > Lo mismo que /query"
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Si <nick> posee espacios, colóquelo entre las comillas dobles (\")."
 
-#: ../src/commandhandler.cpp:178
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Abre una pestaña de mensajes con otro jugador"
+#: src/commandhandler.cpp:246
+msgid "Command: /query <nick>"
+msgstr "Comando: /query <nick>"
 
-#: ../src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Salir del canal"
+#: src/commandhandler.cpp:247
+msgid "Command: /q <nick>"
+msgstr "Comando: /q <nick>"
 
-#: ../src/commandhandler.cpp:194
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Comenzar a guardar el chat en un archivo externo"
+#: src/commandhandler.cpp:248
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+msgstr ""
+"Este comando crea una pestaña para mensajes privados con el jugador <nick>."
 
-#: ../src/commandhandler.cpp:196
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Determina si <enter> muestra/esconde el chat"
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr "Comando: /createparty <nombre>"
 
-#: ../src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Poner un tema en el canal"
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr "Este comando crea un nuevo grupo llamado <nombre>."
 
-#: ../src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
-msgstr "/unignore > Parar de ignorar al jugador"
+#: src/commandhandler.cpp:258
+msgid "Command: /party <nick>"
+msgstr "Comando: /party <nick>"
 
-#: ../src/commandhandler.cpp:186
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Deja de ignorar un jugador"
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Este comando invita al jugador <nick> a formar parte de tu grupo."
 
-#: ../src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Listas de usuarios en el canal"
+#: src/commandhandler.cpp:265
+msgid "Command: /present"
+msgstr "Comando: /present"
 
-#: ../src/commandhandler.cpp:177
-msgid "/w > Alias of msg"
-msgstr "/w > Lo mismo que /msg"
+#: src/commandhandler.cpp:266
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+"Este comando recibe una lista de los jugadores dentro de la audición y la "
+"envía ya sea a la entrada de registro cuando el registro del chat está "
+"activado o el registro de conversaciones (pestaña de chat) de otro modo."
 
-#: ../src/commandhandler.cpp:169
-msgid "/where > Display map name"
-msgstr "/where > Muestra el nombre del mapa"
+#: src/commandhandler.cpp:272
+msgid "Command: /record <filename>"
+msgstr "Comando: /record <nombre_del_archivo>"
 
-#: ../src/commandhandler.cpp:176
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Lo mismo que /msg"
+#: src/commandhandler.cpp:273
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+"Este comando inicia la grabación del chat en el archivo <nombre_del_archivo>."
 
-#: ../src/commandhandler.cpp:170
-msgid "/who > Display number of online users"
-msgstr "/who > Muestra el número de jugadores on-line"
+#: src/commandhandler.cpp:275
+msgid "Command: /record"
+msgstr "Comando: /record"
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr "<"
+#: src/commandhandler.cpp:276
+msgid "This command finishes a recording session."
+msgstr "Este comando termina una sesión de grabación."
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr ""
-"<policy> puede ser \"1\", \"yes\" y \"true\" para habilitar compartir "
-"experiencia, o \"0\", \"no\" y \"false\" para deshabilitar."
+#: src/commandhandler.cpp:280
+msgid "Command: /toggle <state>"
+msgstr "Comando: /toggle <estado>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/commandhandler.cpp:281
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
-"<policy> puede ser \"1\", \"yes\" y \"true\" para habilitar el compartir "
-"objetos, o \"0\", \"no\" y \"false\" para deshabilitar."
+"Este comando determina si la tecla de retorno debe cambiar el registro de "
+"charla, o si el registro de charla se apaga automáticamente."
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:283
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -418,3329 +365,3314 @@ msgstr ""
 "<estado> puede ser \"1\", \"yes\" y \"true\" para activar o \"0\", \"no\" y "
 "\"false\" para desactivar."
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ">"
+#: src/commandhandler.cpp:286
+msgid "Command: /toggle"
+msgstr "Comando: /toggle"
 
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: src/commandhandler.cpp:287
+msgid "This command displays the return toggle status."
+msgstr "Este comando muestra el estado de alternar retorno."
 
-#: ../src/gui/socialwindow.cpp:566
-msgid "Accept Guild Invite"
-msgstr "Aceptar invitación al clan"
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr "Comando: /unignore <jugador>"
 
-#: ../src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Aceptar invitación al grupo"
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr "Este comando deja de ignorar a <jugador> si es ignorado"
 
-#: ../src/gui/socialwindow.cpp:466
-#, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Aceptada la invitación a la guild de  %s."
+#: src/commandhandler.cpp:297
+msgid "Command: /where"
+msgstr "Comando: /where"
 
-#: ../src/gui/socialwindow.cpp:447
-#, c-format
-msgid "Accepted party invite from %s."
-msgstr "Aceptada la invitación de   %s."
+#: src/commandhandler.cpp:298
+msgid "This command displays the name of the current map."
+msgstr "Muestra el nombre del mapa actual."
 
-#: ../src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Aceptando las propuestas de intercambio"
+#: src/commandhandler.cpp:302
+msgid "Command: /who"
+msgstr "Comando: /who"
 
-#: ../src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Aceptar propuestas de intercambio entrantes."
+#: src/commandhandler.cpp:303
+msgid "This command displays the number of players currently online."
+msgstr "Este comando muestra el número de jugadores que están en línea."
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Acesso denegado.Probablemente es que alla muchos jugadores."
+#: src/commandhandler.cpp:309
+msgid "Type /help for a list of commands."
+msgstr "Escribe /help para una lista de comandos."
 
-#: ../src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Configuración de la cuenta y los personajes"
+#: src/commandhandler.cpp:375
+msgid "Cannot send empty whispers!"
+msgstr "No puedes enviar susurros vacíos!"
+
+#: src/commandhandler.cpp:383
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
+"existe, o eres tú."
 
-#: ../src/net/manaserv/loginhandler.cpp:272
-msgid "Account banned"
-msgstr "Cuenta Baneada"
+#: src/commandhandler.cpp:397
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Solicitando la entrada del canal %s."
 
-#: ../src/net/manaserv/loginhandler.cpp:93
-msgid "Account banned."
-msgstr "Cuenta Baneada."
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Falta el nombre del grupo."
 
-#: ../src/net/tmwa/loginhandler.cpp:162
-msgid "Account expired."
-msgstr "La cuenta expiró."
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr "Por favor, especifique un nombre."
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Cuenta no conectada. Por favor conéctate primero."
+#: src/commandhandler.cpp:441
+msgid "Return toggles chat."
+msgstr "Volver a alternar el chat."
 
-#: ../src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Cuenta no encontrada. Por favor conéctate de nuevo."
+#: src/commandhandler.cpp:441
+msgid "Message closes chat."
+msgstr "El mensaje cierra el chat."
 
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
-msgstr "Cuenta: %s"
+#: src/commandhandler.cpp:450
+msgid "Return now toggles chat."
+msgstr "Volver ahora a cambiar de chat."
 
-#: ../src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Anadir"
+#: src/commandhandler.cpp:454
+msgid "Message now closes chat."
+msgstr "Mensaje ahora cierra el chat."
 
-#: ../src/gui/popupmenu.cpp:171
-msgid "Add name to chat"
-msgstr "Anadir el nombre al chat"
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
+msgstr "El jugador ya está ignorado!"
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
-msgid "Add to chat"
-msgstr "Añadir al chat"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
+msgstr "Jugador ignorado!"
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Agilidad"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
+msgstr "El jugador no puede ser ignorado!"
+
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
+msgstr "El jugador no estaba ignorado!"
+
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
+msgstr "El jugador ha sido devuelto al estado normal!"
+
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
+msgstr "El jugador no puede ser devuelto al estado normal!"
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
+#: src/commandhandler.h:31
 #, c-format
-msgid "Agility %+d"
-msgstr "Agilidad %+d"
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Agilidad:"
+#: src/game.cpp:172
+msgid "General"
+msgstr "General"
 
-#: ../src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Aceptar intercambio"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr "Screenshot guardada como"
 
-#: ../src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Aceptado. Esperando..."
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
+msgstr "Fallo al guardar screenshot!"
 
-#: ../src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "Todo"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
+msgstr "Se ha perdido la conexión del servidor."
 
-#: ../src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Permitir intercambios"
+#: src/game.cpp:360
+msgid "Network Error"
+msgstr "Error de conexión"
 
-#: ../src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Permitir mensajes privados"
+#: src/game.cpp:705
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorando las propuestas de intercambio"
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr "El personaje ya está conectado."
+#: src/game.cpp:712
+msgid "Accepting incoming trade requests"
+msgstr "Aceptando las propuestas de intercambio"
 
-#: ../src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Ya se está llevando a cabo la grabación."
+#: src/game.cpp:946
+msgid "Could Not Load Map"
+msgstr "No se pudo cargar el mapa"
 
-#: ../src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Ambiente FX"
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
+msgstr "Error mientras cargaba %s"
 
-#: ../src/gui/debugwindow.cpp:121
+#: src/gui/beingpopup.cpp:75
 #, c-format
-msgid "Ambient FX: %s"
-msgstr "Ambiente FX: %s"
+msgid "Party: %s"
+msgstr "Grupo: %s"
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Comprar"
+
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Un miembro desconocido intentó decir: %s"
+msgid "Price: %s / Total: %s"
+msgstr "Precio: %s / Total: %s"
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Aniquilado."
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+msgid "+"
+msgstr "+"
 
-#: ../src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Aplicar"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+msgid "-"
+msgstr "-"
 
-#: ../src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Salir"
 
-#: ../src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
-msgstr ""
-"Cambiar a OpenGL necesita reiniciar el cliente. En caso de OpenGL atrape tus "
-"graficos, abra el juego atraves de linea de comando con la seguinte opcion: "
-"\"--no-opengl\"."
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+msgid "Max"
+msgstr "Máximo"
 
-#: ../src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "żEstás seguro de que deseas borrar este personaje?"
+#: src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Tienda"
 
-#: ../src/gui/socialwindow.cpp:168
-#, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Estás seguro de dejar el clan %s?"
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Vender"
 
-#: ../src/gui/socialwindow.cpp:247
-#, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Estás seguro de que quieres salir del grupo %s?"
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Atribuir"
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Cambiar e-mail"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Atacar"
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#, c-format
+msgid "Account: %s"
+msgstr "Cuenta: %s"
+
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr "Escribe el nuevo email dos veces:"
 
-#: ../src/resources/itemdb.cpp:53
+#: src/gui/changeemaildialog.cpp:127
 #, c-format
-msgid "Attack %+d"
-msgstr "Ataque %+d"
+msgid "The new email address needs to be at least %d characters long."
+msgstr "El nuevo email debe tener como mínimo %d caracteres."
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: src/gui/changeemaildialog.cpp:134
 #, c-format
-msgid "Attack %s"
-msgstr "Atacar %s"
+msgid "The new email address needs to be less than %d characters long."
+msgstr "El nuevo email debe tener como máximo %d caracteres."
 
-#: ../src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "Audición grabada en el registro del log."
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr "Los e-mail son distintos."
 
-#: ../src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Audio"
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
+msgid "Change Password"
+msgstr "Cambiar contraseña"
 
-#: ../src/net/tmwa/generalhandler.cpp:129
-msgid "Authentication failed."
-msgstr "Fallo en la autentificación."
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: src/gui/changepassworddialog.cpp:63
+msgid "Type new password twice:"
+msgstr "Escribe la nueva contraseña 2 veces:"
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
-msgstr "Fuera del Teclado"
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr "Escribe la contraseña antigua."
 
-#: ../src/gui/popupmenu.cpp:100
+#: src/gui/changepassworddialog.cpp:116
 #, c-format
-msgid "Befriend %s"
-msgstr "Ser amigo %s"
-
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Personaje"
+msgid "The new password needs to be at least %d characters long."
+msgstr "La nueva contraseña debe tener como mínimo %d caracteres."
 
-#: ../src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Sin vida, descansa en paz."
+#: src/gui/changepassworddialog.cpp:123
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "La nueva contraseña debe tener como máximo %d caracteres."
 
-#: ../src/playerrelations.cpp:342
-msgid "Blink name"
-msgstr "Parpadear nombre"
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr "Las nuevas contraseñas no concuerdan."
 
-#: ../src/gui/setup_colors.cpp:138
-msgid "Blue:"
-msgstr "Azul:"
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Crear Personaje"
 
-#: ../src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Burbujas con nombres"
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Nombre:"
 
-#: ../src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Burbujas sin nombres"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ">"
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Comprar"
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr "<"
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Calibrar"
+#: src/gui/charcreatedialog.cpp:74
+msgid "Hair color:"
+msgstr "Color del pelo:"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Cancelar"
+#: src/gui/charcreatedialog.cpp:77
+msgid "Hair style:"
+msgstr "Estilo de pelo:"
 
-#: ../src/commandhandler.cpp:422
-#, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
-"existe, o eres tú."
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:297
+msgid "Create"
+msgstr "Crear"
 
-#: ../src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
-msgstr "No se pudo crear un grupo. Ya estás en uno."
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "Hombre"
 
-#: ../src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
-msgstr "Imposible incrementar!"
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "Mujer"
 
-#: ../src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "No puedes enviar un mensaje vacío!"
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Por favor distribuya %d puntos"
 
-#: ../src/commandhandler.cpp:401
-msgid "Cannot send empty whispers!"
-msgstr "No puedes enviar susurros vacíos!"
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "Su nombre debe de tener como mínimo 4 caracteres."
 
-#: ../src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Imposible gritar!"
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
+msgstr "Puntos de estado del jugador correctamente asignados"
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
-msgid "Cannot use this ID."
-msgstr "Imposible usar esta ID."
+#: src/gui/charcreatedialog.cpp:256
+#, c-format
+msgid "Please remove %d points"
+msgstr "Por favor extraiga %d puntos de estado"
 
-#: ../src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Cambiar"
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Confimar la supresión del personaje"
 
-#: ../src/gui/charselectdialog.cpp:150
-msgid "Change Email"
-msgstr "Cambiar e-mail"
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "żEstás seguro de que deseas borrar este personaje?"
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Cambiar e-mail"
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr "Configuración de la cuenta y los personajes"
 
-#: ../src/gui/worldselectdialog.cpp:76
-msgid "Change Login"
-msgstr "Cambiar de Login"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr "Salir del Login"
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Cambiar contraseña"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Cancelar Registro"
 
-#: ../src/gui/login.cpp:62
-msgid "Change Server"
-msgstr "Cambiar de servidor"
+#: src/gui/charselectdialog.cpp:150
+msgid "Change Email"
+msgstr "Cambiar e-mail"
 
-#: ../src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "Los cambios tendran efecto cuando se cambie de mapa."
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
+#: src/gui/setup_players.cpp:230
+msgid "Delete"
+msgstr "Borrar"
 
-#: ../src/client.cpp:813
-msgid "Changing game servers"
-msgstr "Cambiando el servidor del juego"
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
+msgstr "Seleccionar"
 
-#: ../src/gui/setup_video.cpp:460
-msgid "Changing to OpenGL"
-msgstr "Cambiando a OpenGL"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
+msgstr "(vacío)"
 
-#: ../src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
-msgstr ""
-"Los operadores pueden expulsar y hace operadores a otros jugadores en el "
-"canal."
+#: src/gui/chat.cpp:77
+msgid "Chat"
+msgstr "Chat"
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "Canales no son soportados!"
+#: src/gui/chat.cpp:287
+#, c-format
+msgid "Present: %s; %d players are present."
+msgstr "Presentes: %s; %d jugadores estan presentes."
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Personaje Borrado."
+#: src/gui/chat.cpp:305
+msgid "Attendance written to record log."
+msgstr "Audición grabada en el registro del log."
 
-#: ../src/gui/statuswindow.cpp:238
+#: src/gui/chat.cpp:469
 #, c-format
-msgid "Character points: %d"
-msgstr "Puntos del personaje: %d"
+msgid "Whispering to %s: %s"
+msgstr "Enviando mensaje privado para %s: %s"
 
-#: ../src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Puntos de estado del jugador correctamente asignados"
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Sí"
 
-#: ../src/net/manaserv/charhandler.cpp:143
-msgid "Character's name already exists."
-msgstr "Nombre del jugador ya existe."
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "No"
 
-#: ../src/net/manaserv/charhandler.cpp:155
-msgid "Character's stats are too high."
-msgstr "Atributos del personaje son muy altos."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr "Depurador"
 
-#: ../src/net/manaserv/charhandler.cpp:158
-msgid "Character's stats are too low."
-msgstr "Atributos del personaje son muy bajos."
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr "%d FPS (OpenGL)"
 
-#: ../src/gui/chat.cpp:87
-msgid "Chat"
-msgstr "Chat"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr "%d FPS"
 
-#: ../src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Ventana de Chat"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
+msgstr "Música: %s"
 
-#: ../src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Fallo al crear un chat!"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, c-format
+msgid "Map: %s"
+msgstr "Mapa: %s"
 
-#: ../src/gui/charselectdialog.cpp:380
-msgid "Choose"
-msgstr "Seleccionar"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
+msgstr "Minimapa: %s"
 
-#: ../src/gui/worldselectdialog.cpp:77
-msgid "Choose World"
-msgstr "Escojer Mundo"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr "Cursor: (%d, %d)"
 
-#: ../src/gui/serverdialog.cpp:196
-msgid "Choose Your Server"
-msgstr "Escoja tu servidor"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
+msgstr "Recuento de partículas: %d"
 
-#: ../src/gui/socialwindow.cpp:544
-msgid "Choose your guild's name."
-msgstr "Escoja el nombre de su clan."
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
+msgstr "Detalle de partícula: %s"
 
-#: ../src/gui/socialwindow.cpp:630
-msgid "Choose your party's name."
-msgstr "Escoja el nombre del grupo."
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
+msgstr "Ambiente FX: %s"
 
-#: ../src/gui/npcdialog.cpp:98
-msgid "Clear log"
-msgstr "Limpiar log"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Equipamento"
 
-#: ../src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-"El registro no está soportado. Por favor contacta un administrador del "
-"server."
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Quitárselo"
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr "La version del cliente es demasiado antigua."
+#: src/gui/help.cpp:36
+msgid "Help"
+msgstr "Ayuda"
 
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Colores"
-
-#: ../src/commandhandler.cpp:221
-msgid "Command: /announce <msg>"
-msgstr "Comando: /announce <mensaje>"
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inventario"
 
-#: ../src/commandhandler.cpp:274
-msgid "Command: /away"
-msgstr "Comando: /away"
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+msgid "Equip"
+msgstr "Equipar"
 
-#: ../src/commandhandler.cpp:271
-msgid "Command: /away <afk reason>"
-msgstr "Comando: /away <motivo>"
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+msgid "Use"
+msgstr "Usar"
 
-#: ../src/commandhandler.cpp:228
-msgid "Command: /clear"
-msgstr "Comando: /clear"
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
+#: src/gui/popupmenu.cpp:380
+msgid "Drop..."
+msgstr "Tirar..."
 
-#: ../src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Comando: /close"
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+msgid "Split"
+msgstr "Dividir"
 
-#: ../src/commandhandler.cpp:279
-msgid "Command: /createparty <name>"
-msgstr "Comando: /createparty <nombre>"
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr "Conjuntos"
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Comando: /exp"
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
+msgid "Slots:"
+msgstr "Espacios:"
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Comando: /exp <policy>"
+#: src/gui/inventorywindow.cpp:98
+msgid "Weight:"
+msgstr "Peso:"
 
-#: ../src/commandhandler.cpp:209
-msgid "Command: /help"
-msgstr "Comando: /help"
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Tirar"
 
-#: ../src/commandhandler.cpp:212
-msgid "Command: /help <command>"
-msgstr "Comando: /help <comando>"
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr "OK"
 
-#: ../src/gui/widgets/whispertab.cpp:88
-msgid "Command: /ignore"
-msgstr "Comando: /ignore"
+#: src/gui/itemamount.cpp:102
+msgid "All"
+msgstr "Todo"
 
-#: ../src/commandhandler.cpp:233
-msgid "Command: /ignore <player>"
-msgstr "Comando: /ignore <jugador>"
+#: src/gui/itemamount.cpp:128
+msgid "Select amount of items to trade."
+msgstr "Selecionar la cantidad de objetos a intercambiar."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Comando: /invite <nick>"
+#: src/gui/itemamount.cpp:131
+msgid "Select amount of items to drop."
+msgstr "Selecionar cantidad de objetos a tirar."
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Comando: /item"
+#: src/gui/itemamount.cpp:134
+msgid "Select amount of items to store."
+msgstr "Seleccione la cantidad de objetos a almacenar."
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Comando> /item <policy>"
+#: src/gui/itemamount.cpp:137
+msgid "Select amount of items to retrieve."
+msgstr "Selecciona la cantidad de objetos a retirar."
 
-#: ../src/commandhandler.cpp:239
-msgid "Command: /join <channel>"
-msgstr "Comando: /join <canal>"
+#: src/gui/itemamount.cpp:140
+msgid "Select amount of items to split."
+msgstr "Selecionar la cantidad de objetos para dividir."
 
-#: ../src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Comando: /kick <nick>"
+#: src/gui/itempopup.cpp:92
+#, c-format
+msgid "Weight: %s"
+msgstr "Peso: %s"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Comando: /leave"
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
+msgid "Login"
+msgstr "Login"
 
-#: ../src/commandhandler.cpp:245
-msgid "Command: /list"
-msgstr "Comando: /list"
+#: src/gui/login.cpp:58
+msgid "Remember username"
+msgstr "Recordar nombre de usuario"
 
-#: ../src/commandhandler.cpp:250
-msgid "Command: /me <message>"
-msgstr "Comando: /me <mensaje>"
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "Registrar"
 
-#: ../src/commandhandler.cpp:255
-msgid "Command: /msg <nick> <message>"
-msgstr "Comando: /msg <nick> <mensaje>"
+#: src/gui/login.cpp:60
+msgid "Change Server"
+msgstr "Cambiar de servidor"
 
-#: ../src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Comando: /op <nick>"
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+msgid "Map"
+msgstr "Mapa"
 
-#: ../src/commandhandler.cpp:284
-msgid "Command: /party <nick>"
-msgstr "Comando: /party <nick>"
+#: src/gui/npcdialog.cpp:44
+msgid "Waiting for server"
+msgstr "Esperando al servidor"
 
-#: ../src/commandhandler.cpp:291
-msgid "Command: /present"
-msgstr "Comando: /present"
+#: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Siguiente"
 
-#: ../src/commandhandler.cpp:265
-msgid "Command: /q <nick>"
-msgstr "Comando: /q <nick>"
+#: src/gui/npcdialog.cpp:47
+msgid "Submit"
+msgstr "Enviar"
 
-#: ../src/commandhandler.cpp:264
-msgid "Command: /query <nick>"
-msgstr "Comando: /query <nick>"
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: ../src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Comando: /quit"
+#: src/gui/npcdialog.cpp:110
+msgid "Reset"
+msgstr "Resetear"
 
-#: ../src/commandhandler.cpp:301
-msgid "Command: /record"
-msgstr "Comando: /record"
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+msgid ""
+"\n"
+"> Next\n"
+msgstr ""
+"\n"
+"> Siguiente\n"
 
-#: ../src/commandhandler.cpp:298
-msgid "Command: /record <filename>"
-msgstr "Comando: /record <nombre_del_archivo>"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Para:"
 
-#: ../src/commandhandler.cpp:312
-msgid "Command: /toggle"
-msgstr "Comando: /toggle"
+#: src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Enviar"
 
-#: ../src/commandhandler.cpp:306
-msgid "Command: /toggle <state>"
-msgstr "Comando: /toggle <estado>"
+#: src/gui/npcpostdialog.cpp:96
+msgid "Failed to send as sender or letter invalid."
+msgstr "Fallo al enviar o mensaje inválido."
 
-#: ../src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Comando: /topic <mensaje>"
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr "Conjuntos: %d"
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
-msgid "Command: /unignore <player>"
-msgstr "Comando: /unignore <jugador>"
+#: src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr "Quitárselo antes"
 
-#: ../src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Comando: /users"
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "Trade with %s..."
+msgstr "Negociar con %s..."
 
-#: ../src/commandhandler.cpp:257
-msgid "Command: /w <nick> <message>"
-msgstr "Comando: /w <nick> <mensaje>"
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, c-format
+msgid "Attack %s"
+msgstr "Atacar %s"
 
-#: ../src/commandhandler.cpp:323
-msgid "Command: /where"
-msgstr "Comando: /where"
+#: src/gui/popupmenu.cpp:92
+#, c-format
+msgid "Whisper %s"
+msgstr "Mensaje Privado %s"
 
-#: ../src/commandhandler.cpp:256
-msgid "Command: /whisper <nick> <message>"
-msgstr "Comando: /whisper <nick> <mensaje>"
+#: src/gui/popupmenu.cpp:101
+#, c-format
+msgid "Befriend %s"
+msgstr "Ser amigo %s"
 
-#: ../src/commandhandler.cpp:328
-msgid "Command: /who"
-msgstr "Comando: /who"
+#: src/gui/popupmenu.cpp:106
+#, c-format
+msgid "Disregard %s"
+msgstr "Desagregar %s"
 
-#: ../src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Completado"
+#: src/gui/popupmenu.cpp:109
+#, c-format
+msgid "Ignore %s"
+msgstr "Ignorar %s"
 
-#: ../src/playerrelations.cpp:312
-msgid "Completely ignore"
-msgstr "Ignorar completamente"
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#, c-format
+msgid "Unignore %s"
+msgstr "Dejar de Ignorar %s"
 
-#: ../src/gui/popupmenu.cpp:117
+#: src/gui/popupmenu.cpp:118
 #, c-format
 msgid "Completely ignore %s"
 msgstr "Ignorar completamente %s"
 
-#: ../src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Confimar la supresión del personaje"
-
-#: ../src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Confirmar:"
-
-#: ../src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Confirmado. Esperando..."
-
-#: ../src/keyboardconfig.cpp:184
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
-"puede presentar un comportamiento raro."
+msgid "Follow %s"
+msgstr "Seguir %s"
 
-#: ../src/gui/serverdialog.cpp:233
-msgid "Connect"
-msgstr "Conectar"
+#: src/gui/popupmenu.cpp:133
+#, c-format
+msgid "Invite %s to join your guild"
+msgstr "Invitar a %s para unirse a tu clan"
 
-#: ../src/client.cpp:655
-msgid "Connecting to server"
-msgstr "Conectando al servidor"
+#: src/gui/popupmenu.cpp:137
+#, c-format
+msgid "Invite %s to join your party"
+msgstr "Invitar a %s para su grupo"
 
-#: ../src/client.cpp:803
-msgid "Connecting to the game server"
-msgstr "Conectando al servidor del juego"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
+msgstr "Expulsar jugador"
 
-#: ../src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Conectando..."
+#: src/gui/popupmenu.cpp:153
+#, c-format
+msgid "Talk to %s"
+msgstr "Hablar con %s"
 
-#: ../src/net/tmwa/network.cpp:414
-msgid "Connection to server terminated. "
-msgstr "Conexión al servidor terminada."
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
+msgstr "Expulsar monstruo"
 
-#: ../src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr "Copiar el conjunto"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
+msgstr "Anadir el nombre al chat"
 
-#: ../src/gui/statuswindow.cpp:244
+#: src/gui/popupmenu.cpp:191
 #, c-format
-msgid "Correction points: %d"
-msgstr "Puntos de corrección: %d"
+msgid "Pick up %s"
+msgstr "Coger %s"
 
-#: ../src/game.cpp:950
-msgid "Could Not Load Map"
-msgstr "No se pudo cargar el mapa"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
+msgstr "Añadir al chat"
 
-#: ../src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "No es posible crear un grupo."
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
+msgid "Store"
+msgstr "Almacenar"
 
-#: ../src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
-msgstr "No se puede invitar jugadores al clan."
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
+msgid "Retrieve"
+msgstr "Retirar"
 
-#: ../src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Imposible entrar en un grupo!"
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Cambiar de servidor"
 
-#: ../src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "No puedes robar nada..."
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Cambiar de personaje"
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Crear"
+#: src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Finalizando grabación."
 
-#: ../src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Crear Personaje"
+#: src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "No se está grabando en este momento."
 
-#: ../src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Crear clan"
+#: src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Ya se está llevando a cabo la grabación."
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
-msgid "Create Party"
-msgstr "Crear grupo"
+#: src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Iniciando la grabación..."
 
-#: ../src/gui/socialwindow.cpp:507
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Creando clan llamado %s."
+#: src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Fallo al empezar la grabación."
 
-#: ../src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
-msgstr "Fallo al crear Guild escoja un nombre mas corto."
+#: src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Grabando..."
 
-#: ../src/gui/socialwindow.cpp:529
-#, c-format
-msgid "Creating party called %s."
-msgstr "Creando grupo llamado %s."
+#: src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Parar de grabar"
 
-#: ../src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
-msgstr "Fallo al crear un Grupo escoja un nombre mas corto."
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Confirmar:"
 
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Golpe Critico"
+#: src/gui/register.cpp:100
+msgid "Email:"
+msgstr "Email:"
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/register.cpp:166
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Cursor: (%d, %d)"
+msgid "The username needs to be at least %d characters long."
+msgstr "El nombre debe tener como mínimo %d caracteres."
 
-#: ../src/gui/serverdialog.cpp:234
-msgid "Custom Server"
-msgstr "Servidor propio"
+#: src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "El nombre debe tener menos de  %d caracteres."
 
-#: ../src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "Cursor propio"
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "La contraseña debe tener al menos %d caracteres."
 
-#: ../src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
-msgstr "Desativando OpenGL"
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "La contraseña debe tener como mínimo %d caracteres."
 
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr "Depurador"
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Las contraseñas no coinciden."
 
-#: ../src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Ventana de Problemas"
+#: src/gui/serverdialog.cpp:124
+msgid "Choose Your Server"
+msgstr "Escoja tu servidor"
 
-#: ../src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Por defecto"
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Servidor:"
 
-#: ../src/net/tmwa/generalhandler.cpp:225
-msgid "Defense"
-msgstr "Defensa"
+#: src/gui/serverdialog.cpp:132
+msgid "Port:"
+msgstr "Puerto:"
 
-#: ../src/resources/itemdb.cpp:54
-#, c-format
-msgid "Defense %+d"
-msgstr "Defensa %+d"
+#: src/gui/serverdialog.cpp:133
+msgid "Server type:"
+msgstr "Tipo de servidor:"
 
-#: ../src/gui/setup_colors.cpp:93
-msgid "Delay:"
-msgstr "Atraso:"
+#: src/gui/serverdialog.cpp:153
+msgid "Connect"
+msgstr "Conectar"
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Borrar"
+#: src/gui/serverdialog.cpp:154
+msgid "Custom Server"
+msgstr "Servidor propio"
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Destreza"
+#: src/gui/serverdialog.cpp:242
+msgid "Please type both the address and the port of a server."
+msgstr "Por favor especifique el nombre y el puerto del servidor."
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: src/gui/serverdialog.cpp:357
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Destreza %+d"
-
-#: ../src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Destreza:"
-
-#: ../src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
-msgstr "Desabilitar transparencia (CPU Modo)"
+msgid "Downloading server list...%2.2f%%"
+msgstr "Bajando la lista de servidores...%2.2f%%"
 
-#: ../src/gui/popupmenu.cpp:105
-#, c-format
-msgid "Disregard %s"
-msgstr "Desagregar %s"
+#: src/gui/serverdialog.cpp:363
+msgid "Waiting for server..."
+msgstr "Esperando al servidor..."
 
-#: ../src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Desconocido"
+#: src/gui/serverdialog.cpp:367
+msgid "Preparing download"
+msgstr "Preparando la descarga"
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Deseas que tus posesiones sean identificadas?"
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Sonido"
 
-#: ../src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:43
 msgid "Download music"
 msgstr "Bajar Música"
 
-#: ../src/gui/serverdialog.cpp:442
-#, c-format
-msgid "Downloading server list...%2.2f%%"
-msgstr "Bajando la lista de servidores...%2.2f%%"
+#: src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Audio"
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
-msgid "Drop"
-msgstr "Tirar"
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Volumen Sfx"
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
-msgid "Drop..."
-msgstr "Tirar..."
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Volumen de Música"
 
-#: ../src/net/tmwa/generalhandler.cpp:145
-msgid "Duplicated login."
-msgstr "Login duplicado."
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr "Anuncio"
 
-#: ../src/client.cpp:905
-msgid "Email Change"
-msgstr "Cambiar e-mail"
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr "Necesitas reiniciar el client si quieres descargar la musica"
 
-#: ../src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr "El e-mail ya existe."
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr "Mecanismo de Sonido"
 
-#: ../src/client.cpp:906
-msgid "Email changed successfully!"
-msgstr "Email modificado correctamente!"
+#: src/gui/setup_colors.cpp:45
+msgid "This is what the color looks like"
+msgstr "Así es como se verá el color"
 
-#: ../src/gui/register.cpp:100
-msgid "Email:"
-msgstr "Email:"
+#: src/gui/setup_colors.cpp:50
+msgid "Colors"
+msgstr "Colores"
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Atajo para Emoticono %d"
+#: src/gui/setup_colors.cpp:71
+msgid "Type:"
+msgstr "Tipo:"
 
-#: ../src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr "Ventana de Emoticonos"
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+msgid "Static"
+msgstr "Estático"
 
-#: ../src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Fallo al hacer un emoticono!"
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
+msgid "Pulse"
+msgstr "Pulso"
 
-#: ../src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr "Adress vacía enviada a Network::connect()!"
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
+msgid "Rainbow"
+msgstr "Arcoiris"
 
-#: ../src/gui/setup_joystick.cpp:39
-msgid "Enable joystick"
-msgstr "Habilitar joystick"
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
+msgid "Spectrum"
+msgstr "Espectro"
 
-#: ../src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Habilitar/Desabilitar intercambios"
+#: src/gui/setup_colors.cpp:93
+msgid "Delay:"
+msgstr "Atraso:"
 
-#: ../src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr "Fin de la lista de canales."
+#: src/gui/setup_colors.cpp:108
+msgid "Red:"
+msgstr "Rojo:"
 
-#: ../src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr "Escribe la contraseña antigua."
+#: src/gui/setup_colors.cpp:123
+msgid "Green:"
+msgstr "Verde:"
 
-#: ../src/client.cpp:715
-msgid "Entering game world"
-msgstr "Entrando al juego"
+#: src/gui/setup_colors.cpp:138
+msgid "Blue:"
+msgstr "Azul:"
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
-msgid "Equip"
-msgstr "Equipar"
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Aplicar"
 
-#: ../src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
-msgstr "Equipar las flechas primero."
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Restaurar Ventanas"
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Equipamento"
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Aprieta el botón para empezar a calibrar"
 
-#: ../src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Ventana de equipamento"
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Calibrar"
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "Error"
+#: src/gui/setup_joystick.cpp:39
+msgid "Enable joystick"
+msgstr "Habilitar joystick"
 
-#: ../src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Error al crear el clan."
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
-msgid "Error creating updates directory!"
-msgstr "Error creando la carpeta de actualizaciones!"
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Parar"
 
-#: ../src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr "Error al entrar al canal."
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Gira el stick"
 
-#: ../src/gui/serverdialog.cpp:456
-msgid "Error retreiving server list!"
-msgstr "Error al recuperar la lista de servers!"
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Teclado"
 
-#: ../src/game.cpp:951
-#, c-format
-msgid "Error while loading %s"
-msgstr "Error mientras cargaba %s"
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Atribuir"
 
-#: ../src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr "Exp"
+#: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr "Retirar"
 
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "Aviso de experiencia"
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Por defecto"
 
-#: ../src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "Exp:"
+#: src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Conflicto de teclas detectado."
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr "Compartir experiencia desactivado ."
+#: src/gui/setup_players.cpp:57
+msgid "Name"
+msgstr "Nombre"
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr "Compartir experiencia activado."
+#: src/gui/setup_players.cpp:58
+msgid "Relation"
+msgstr "Relación"
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr "Imposible compartir experiencia."
+#: src/gui/setup_players.cpp:63
+msgid "Neutral"
+msgstr "Neutral"
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
-msgid "Experience sharing unknown."
-msgstr "Compartir experiencia desconocido."
+#: src/gui/setup_players.cpp:64
+msgid "Friend"
+msgstr "Amigo"
 
-#: ../src/gui/setup_video.cpp:238
-msgid "FPS limit:"
-msgstr "Limite FPS:"
+#: src/gui/setup_players.cpp:65
+msgid "Disregarded"
+msgstr "Desconocido"
 
-#: ../src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Fallo al anadir objeto por una razón desconocida."
+#: src/gui/setup_players.cpp:66
+msgid "Ignored"
+msgstr "Ignorado"
 
-#: ../src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Error al anadir objeto. El otro jugador no tiene más espacio."
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+msgid "???"
+msgstr "???"
 
-#: ../src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Error al añadir objeto. El otro jugador lleva mucho peso."
+#: src/gui/setup_players.cpp:226
+msgid "Allow trading"
+msgstr "Permitir intercambios"
 
-#: ../src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
-"la ventana."
+#: src/gui/setup_players.cpp:228
+msgid "Allow whispers"
+msgstr "Permitir mensajes privados"
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Error al crear personaje. Probablemente ya esté en uso."
+#: src/gui/setup_players.cpp:232
+msgid "Put all whispers in tabs"
+msgstr "Mostrar nuevos susurros en pestañas"
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "Fallo al borrar el personaje."
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr "Mostrar género (del personaje)"
 
-#: ../src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Error al cambiar estado del miembro."
+#: src/gui/setup_players.cpp:236
+msgid "Players"
+msgstr "Jugadores"
 
-#: ../src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "Fallo al enviar o mensaje inválido."
+#: src/gui/setup_players.cpp:261
+msgid "When ignoring:"
+msgstr "Cuando se ignora a alguien:"
 
-#: ../src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Fallo al empezar la grabación."
+#: src/gui/setup_video.cpp:113
+msgid "Tiny"
+msgstr "Minúsculo"
 
-#: ../src/gui/setup_video.cpp:434
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Fallo al cambiar para el modo ventana completa y fallo al restaurar el modo "
-"anterior!"
+#: src/gui/setup_video.cpp:114
+msgid "Small"
+msgstr "Pequeño"
 
-#: ../src/gui/setup_video.cpp:428
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Fallo al cambiar para el modo ventana y fallo al restaurar el modo anterior!"
+#: src/gui/setup_video.cpp:115
+msgid "Medium"
+msgstr "Media"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
-msgid "Failed to use item."
-msgstr "Fallo al usar el objeto."
+#: src/gui/setup_video.cpp:116
+msgid "Large"
+msgstr "Grande"
 
-#: ../src/client.cpp:927
-msgid "Farewell, come back any time..."
-msgstr "Adiós, vuelve cuando quieras..."
+#: src/gui/setup_video.cpp:142
+msgid "No text"
+msgstr "Sin texto"
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
-msgid "Female"
-msgstr "Mujer"
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Texto"
 
-#: ../src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "Encontrar Camino al Mouse"
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles, no names"
+msgstr "Burbujas sin nombres"
 
-#: ../src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Finalizando grabación."
+#: src/gui/setup_video.cpp:145
+msgid "Bubbles with names"
+msgstr "Burbujas con nombres"
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr "Burbuja '...' flotante"
+#: src/gui/setup_video.cpp:157
+msgid "off"
+msgstr "apagado"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr "Burbuja Flotante"
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+msgid "low"
+msgstr "bajo"
 
-#: ../src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Tamaño de fuente"
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+msgid "high"
+msgstr "alto"
 
-#: ../src/commandhandler.cpp:205
-msgid "For more information, type /help <command>."
-msgstr "Para mas informacion,  pon /help <comando>."
+#: src/gui/setup_video.cpp:172
+msgid "medium"
+msgstr "medio"
 
-#: ../src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Amigo"
+#: src/gui/setup_video.cpp:174
+msgid "max"
+msgstr "máximo"
 
-#: ../src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "Nombres De Los GMs"
+#: src/gui/setup_video.cpp:197
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
-msgid "Game"
-msgstr "Juego"
+#: src/gui/setup_video.cpp:198
+msgid "Custom cursor"
+msgstr "Cursor propio"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Fin Del Juego!"
+#: src/gui/setup_video.cpp:200
+msgid "Visible names"
+msgstr "Nombres Visibles"
 
-#: ../src/game.cpp:169
-msgid "General"
-msgstr "General"
+#: src/gui/setup_video.cpp:202
+msgid "Particle effects"
+msgstr "Efectos de partículas"
 
-#: ../src/gui/widgets/chattab.cpp:126
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Anuncio global de  %s:"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
+msgstr "Mostrar nombre propio"
 
-#: ../src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Anuncio global:"
+#: src/gui/setup_video.cpp:205
+msgid "Show pickup notification"
+msgstr "Mostrar aviso al coger algo"
 
-#: ../src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
-msgstr "Desconectado del servidor!"
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
+msgid "in chat"
+msgstr "en chat"
 
-#: ../src/gui/setup_colors.cpp:123
-msgid "Green:"
-msgstr "Verde:"
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
+msgid "as particle"
+msgstr "como partícula"
 
-#: ../src/gui/setup_video.cpp:261
-msgid "Gui opacity"
-msgstr "Opacidad"
+#: src/gui/setup_video.cpp:214
+msgid "FPS limit:"
+msgstr "Limite FPS:"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Clan"
+#: src/gui/setup_video.cpp:225
+msgid "Video"
+msgstr "Vídeo"
 
-#: ../src/gui/socialwindow.cpp:143
-#, c-format
-msgid "Guild %s quit requested."
-msgstr "Clan %s pidiendo salir."
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr "Mostrar daño recibido"
 
-#: ../src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr "Miembros del guild"
+#: src/gui/setup_video.cpp:233
+msgid "Overhead text"
+msgstr "Texto sobrescrito"
 
-#: ../src/gui/socialwindow.cpp:543
-msgid "Guild Name"
-msgstr "Nombre del clan"
+#: src/gui/setup_video.cpp:234
+msgid "Gui opacity"
+msgstr "Opacidad"
 
-#: ../src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Clan creado."
+#: src/gui/setup_video.cpp:235
+msgid "Ambient FX"
+msgstr "Ambiente FX"
 
-#: ../src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
-msgstr "La creación de guilds no esta soportada."
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
+msgstr "Detalle de partículas"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
-msgid "Guild name is missing."
-msgstr "Falta el nombre del clan."
+#: src/gui/setup_video.cpp:237
+msgid "Font size"
+msgstr "Tamaño de fuente"
 
-#: ../src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr "PV"
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+msgid "None"
+msgstr "Nada"
 
-#: ../src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "PV %+d"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr ""
+"Fallo al cambiar para el modo ventana y fallo al restaurar el modo anterior!"
 
-#: ../src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "PV:"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr ""
+"Fallo al cambiar para el modo ventana completa y fallo al restaurar el modo "
+"anterior!"
 
-#: ../src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
-msgstr "Color del pelo:"
+#: src/gui/setup_video.cpp:398
+msgid "Switching to Full Screen"
+msgstr "Cambiando a pantalla completa"
 
-#: ../src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
-msgstr "Estilo de pelo:"
+#: src/gui/setup_video.cpp:399
+msgid "Restart needed for changes to take effect."
+msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
-#: ../src/gui/help.cpp:37
-msgid "Help"
-msgstr "Ayuda"
+#: src/gui/setup_video.cpp:411
+msgid "Changing to OpenGL"
+msgstr "Cambiando a OpenGL"
 
-#: ../src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Ventana de ayuda"
+#: src/gui/setup_video.cpp:412
+msgid "Applying change to OpenGL requires restart."
+msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
-#: ../src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Esconder ventanas"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
+msgstr "Resolución de pantalla cambiada"
 
-#: ../src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Huh? Qué es eso?"
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+msgid "Restart your client for the change to take effect."
+msgstr "Reincie el juego para que los cambios tengan efecto."
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Creo que esto no fue muy bien."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
 
-#: ../src/commandhandler.cpp:241
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Si el  <canal> no existe, sera creado."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
+msgstr "Configuración del efecto de las partículas cambiado."
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Si <nick> posee espacios, colóquelo entre las comillas dobles (\")."
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
+msgstr "Los cambios tendran efecto cuando se cambie de mapa."
 
-#: ../src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "Si no estuvieras tan animado, diría que estás muerto."
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Habilidades"
 
-#: ../src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Si eres la última persona de este canal , será eliminado."
+#: src/gui/skilldialog.cpp:209
+msgid "Up"
+msgstr "Encima"
 
-#: ../src/gui/popupmenu.cpp:108
+#: src/gui/skilldialog.cpp:263
 #, c-format
-msgid "Ignore %s"
-msgstr "Ignorar %s"
-
-#: ../src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "Ignorar input 1"
+msgid "Skill points available: %d"
+msgstr "Puntos de habilidades: %d"
 
-#: ../src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "Ignorar input 2"
+#: src/gui/skilldialog.cpp:315
+#, c-format
+msgid "Skill Set %d"
+msgstr "Habilidades %d"
 
-#: ../src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Ignorado"
+#: src/gui/skilldialog.cpp:324
+#, c-format
+msgid "Skill %d"
+msgstr "Habilidad %d"
 
-#: ../src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorando las propuestas de intercambio"
+#: src/gui/skilldialog.cpp:406
+#, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Nivel: %d (%+d)"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorar las propuestas de intercambio entrantes."
+#: src/gui/skilldialog.cpp:417
+#, c-format
+msgid "Lvl: %d"
+msgstr "Nivel: %d"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Información"
+#: src/gui/socialwindow.cpp:118
+#, c-format
+msgid "Invited user %s to guild %s."
+msgstr "Invita al jugador %s para su clan %s."
 
-#: ../src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "Inserta moneda para continuar."
+#: src/gui/socialwindow.cpp:127
+#, c-format
+msgid "Guild %s quit requested."
+msgstr "Clan %s pidiendo salir."
 
-#: ../src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "PV insuficiente!"
+#: src/gui/socialwindow.cpp:137
+msgid "Member Invite to Guild"
+msgstr "Miembro invitado al clan."
 
-#: ../src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "SP insuficiente!"
+#: src/gui/socialwindow.cpp:138
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr "A quién te gustaría invitar al clan %s?"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Inteligencia"
+#: src/gui/socialwindow.cpp:147
+msgid "Leave Guild?"
+msgstr "Salir del clan?"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
+#: src/gui/socialwindow.cpp:148
 #, c-format
-msgid "Intelligence %+d"
-msgstr "Inteligencia %+d"
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Estás seguro de dejar el clan %s?"
 
-#: ../src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Inteligencia:"
+#: src/gui/socialwindow.cpp:183
+#, c-format
+msgid "Invited user %s to party."
+msgstr "Jugador %s invitado al grupo."
 
-#: ../src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
-msgstr "Género no válido."
+#: src/gui/socialwindow.cpp:190
+#, c-format
+msgid "Party %s quit requested."
+msgstr "Grupo %s requisitado."
 
-#: ../src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
-msgstr "Color del pelo no válido."
+#: src/gui/socialwindow.cpp:200
+msgid "Member Invite to Party"
+msgstr "Invitación de un miembro al grupo"
 
-#: ../src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
-msgstr "Estilo de pelo no válido."
+#: src/gui/socialwindow.cpp:201
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr "A quién te gustaría invitar al grupo %s?"
 
-#: ../src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
-msgstr "Nombre no válido."
+#: src/gui/socialwindow.cpp:210
+msgid "Leave Party?"
+msgstr "Salir del grupo?"
 
-#: ../src/client.cpp:1244
+#: src/gui/socialwindow.cpp:211
 #, c-format
-msgid "Invalid update host: %s"
-msgstr "Host de actualización inválido: %s"
+msgid "Are you sure you want to leave party %s?"
+msgstr "Estás seguro de que quieres salir del grupo %s?"
 
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inventario"
+#: src/gui/socialwindow.cpp:240
+msgid "Create Guild"
+msgstr "Crear clan"
 
-#: ../src/keyboardconfig.cpp:72
-msgid "Inventory Window"
-msgstr "Ventana de inventario"
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+msgid "Create Party"
+msgstr "Crear grupo"
 
-#: ../src/localplayer.cpp:1254
-#, fuzzy
-msgid "Inventory is full."
-msgstr "Servidor lleno."
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr "Social"
 
-#: ../src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:298
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../src/gui/popupmenu.cpp:130
+#: src/gui/socialwindow.cpp:299
+msgid "Leave"
+msgstr "Dejar"
+
+#: src/gui/socialwindow.cpp:395
 #, c-format
-msgid "Invite %s to join your guild"
-msgstr "Invitar a %s para unirse a tu clan"
+msgid "Accepted party invite from %s."
+msgstr "Aceptada la invitación de   %s."
 
-#: ../src/gui/popupmenu.cpp:134
+#: src/gui/socialwindow.cpp:401
 #, c-format
-msgid "Invite %s to join your party"
-msgstr "Invitar a %s para su grupo"
+msgid "Rejected party invite from %s."
+msgstr "Cancelada la invitación de  %s."
 
-#: ../src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Invitación enviada."
+#: src/gui/socialwindow.cpp:414
+#, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Aceptada la invitación a la guild de  %s."
 
-#: ../src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:420
 #, c-format
-msgid "Invited user %s to guild %s."
-msgstr "Invita al jugador %s para su clan %s."
+msgid "Rejected guild invite from %s."
+msgstr "Cancelada la invitación a la guild de %s."
 
-#: ../src/net/tmwa/partyhandler.cpp:335
+#: src/gui/socialwindow.cpp:464
 #, c-format
-msgid "Invited user %s to party."
-msgstr "Jugador %s invitado al grupo."
+msgid "Creating guild called %s."
+msgstr "Creando clan llamado %s."
 
-#: ../src/net/tmwa/partyhandler.cpp:340
+#: src/gui/socialwindow.cpp:478
 #, c-format
-msgid "Inviting failed, because you can't see a player called %s."
-msgstr "Imposible invitar por que no puedes ver al jugador %s."
+msgid "Creating party called %s."
+msgstr "Creando grupo llamado %s."
+
+#: src/gui/socialwindow.cpp:485
+msgid "Guild Name"
+msgstr "Nombre del clan"
+
+#: src/gui/socialwindow.cpp:486
+msgid "Choose your guild's name."
+msgstr "Escoja el nombre de su clan."
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
+#: src/gui/socialwindow.cpp:498
+msgid "Received guild request, but one already exists."
+msgstr "Recibida petición de creación del clan, pero ya existe."
+
+#: src/gui/socialwindow.cpp:503
 #, c-format
-msgid "Item Shortcut %d"
-msgstr "Atajo para el objeto %d"
+msgid "%s has invited you to join the guild %s."
+msgstr "%s te ha invitado al clan %s."
 
-#: ../src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Ventana de atajos para objetos"
+#: src/gui/socialwindow.cpp:508
+msgid "Accept Guild Invite"
+msgstr "Aceptar invitación al clan"
 
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
-msgstr ""
+#: src/gui/socialwindow.cpp:520
+msgid "Received party request, but one already exists."
+msgstr "Recibida petición de creación del grupo, pero ya existe."
 
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
-msgstr ""
+#: src/gui/socialwindow.cpp:530
+msgid "You have been invited you to join a party."
+msgstr "Fuiste invitado a un grupo."
 
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
-msgstr ""
+#: src/gui/socialwindow.cpp:534
+#, c-format
+msgid "You have been invited to join the %s party."
+msgstr "Has sido invitado para unirte al grupo %s."
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Compartir objetos desabilitado."
+#: src/gui/socialwindow.cpp:542
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s te ha invitado a unirte a su grupo."
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Compartir objetos habilitado."
+#: src/gui/socialwindow.cpp:547
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s te ha invitado para unirte al grupo %s."
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "No es posible el compartir objetos."
+#: src/gui/socialwindow.cpp:555
+msgid "Accept Party Invite"
+msgstr "Aceptar invitación al grupo"
 
-#: ../src/net/tmwa/gui/partytab.cpp:141
-msgid "Item sharing unknown."
-msgstr "Compartir objetos desconocido."
+#: src/gui/socialwindow.cpp:566
+msgid "Cannot create party. You are already in a party"
+msgstr "No se pudo crear un grupo. Ya estás en uno."
 
-#: ../src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr "Trabajo"
+#: src/gui/socialwindow.cpp:571
+msgid "Party Name"
+msgstr "Nombre del grupo"
 
-#: ../src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Trabajo:"
+#: src/gui/socialwindow.cpp:572
+msgid "Choose your party's name."
+msgstr "Escoja el nombre del grupo."
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+msgid "Specials"
+msgstr "Especiales"
+
+#: src/gui/specialswindow.cpp:174
 #, c-format
-msgid "Job: %d"
-msgstr "Trabajo: %d"
+msgid "Specials Set %d"
+msgstr "Especiales %d"
 
-#: ../src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Entraste al grupo."
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr "Especial %d"
 
-#: ../src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Nivel: %d"
 
-#: ../src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Conflicto de teclas detectado."
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr "Dinero: %s"
 
-#: ../src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Teclado"
+#: src/gui/statuswindow.cpp:104
+msgid "HP:"
+msgstr "PV:"
 
-#: ../src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Error al expulsar!"
+#: src/gui/statuswindow.cpp:109
+msgid "Exp:"
+msgstr "Exp:"
 
-#: ../src/gui/popupmenu.cpp:163
-msgid "Kick monster"
-msgstr "Expulsar monstruo"
+#: src/gui/statuswindow.cpp:114
+msgid "MP:"
+msgstr "PM:"
 
-#: ../src/gui/popupmenu.cpp:141
-msgid "Kick player"
-msgstr "Expulsar jugador"
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr "Trabajo: %d"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Expulsado satisfactoriamente!"
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr "Trabajo:"
 
-#: ../src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Grande"
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr "PV"
 
-#: ../src/gui/socialwindow.cpp:335
-msgid "Leave"
-msgstr "Dejar"
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr "PM"
 
-#: ../src/gui/socialwindow.cpp:167
-msgid "Leave Guild?"
-msgstr "Salir del clan?"
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr "Exp"
 
-#: ../src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
-msgstr "Salir del grupo?"
+#: src/gui/statuswindow.cpp:215
+msgid "Money"
+msgstr "Dinero"
 
-#: ../src/gui/statuswindow.cpp:257
-msgid "Level"
-msgstr "Nivel"
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr "Trabajo"
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:229
 #, c-format
-msgid "Level: %d"
-msgstr "Nivel: %d"
+msgid "Character points: %d"
+msgstr "Puntos del personaje: %d"
 
-#: ../src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr "Lista de canales."
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr "Puntos de corrección: %d"
 
-#: ../src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr "Golpe Critico del jugador"
+#: src/gui/statuswindow.cpp:251
+msgid "Level"
+msgstr "Nivel"
 
-#: ../src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr "Cuando le atacas al monstruo"
+#: src/gui/storagewindow.cpp:59
+msgid "Storage"
+msgstr "Almacén"
 
-#: ../src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr "Cuando fallas un ataque"
+#: src/gui/trade.cpp:52
+msgid "Propose trade"
+msgstr "Proponer el intercambio"
 
-#: ../src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
-msgstr "Log dealogos con un NPC"
+#: src/gui/trade.cpp:53
+msgid "Confirmed. Waiting..."
+msgstr "Confirmado. Esperando..."
 
-#: ../src/client.cpp:682
-msgid "Logging in"
-msgstr "Acediendo a la cuenta"
+#: src/gui/trade.cpp:54
+msgid "Agree trade"
+msgstr "Aceptar intercambio"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
-msgid "Login"
-msgstr "Login"
+#: src/gui/trade.cpp:55
+msgid "Agreed. Waiting..."
+msgstr "Aceptado. Esperando..."
 
-#: ../src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr "Intento de conexión muy pronto tras intento previo."
+#: src/gui/trade.cpp:58
+msgid "Trade: You"
+msgstr "Intercambio: Tú"
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Parece que te tiraron tu cabeza a tus manos."
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+msgid "Trade"
+msgstr "Intercambio"
 
-#: ../src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Suerte"
+#: src/gui/trade.cpp:77
+msgid "Add"
+msgstr "Anadir"
 
-#: ../src/net/tmwa/generalhandler.cpp:106
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
 #, c-format
-msgid "Luck %+d"
-msgstr "Suerte %+d"
+msgid "You get %s"
+msgstr "Tú recibes %s"
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Suerte:"
+#: src/gui/trade.cpp:100
+msgid "You give:"
+msgstr "Tú das:"
 
-#: ../src/gui/skilldialog.cpp:455
-#, c-format
-msgid "Lvl: %d"
-msgstr "Nivel: %d"
+#: src/gui/trade.cpp:104
+msgid "Change"
+msgstr "Cambiar"
 
-#: ../src/gui/skilldialog.cpp:444
-#, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Nivel: %d (%+d)"
+#: src/gui/trade.cpp:275
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
+"la ventana."
 
-#: ../src/net/tmwa/generalhandler.cpp:226
-msgid "M.Attack"
-msgstr "Ataque M."
+#: src/gui/trade.cpp:318
+msgid "You don't have enough money."
+msgstr "No tienes dinero suficiente."
 
-#: ../src/net/tmwa/generalhandler.cpp:227
-msgid "M.Defense"
-msgstr "Defensa M."
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Nombre: %s"
 
-#: ../src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr "PM"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Actualizando..."
 
-#: ../src/resources/itemdb.cpp:56
-#, c-format
-msgid "MP %+d"
-msgstr "PM %+d"
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Conectando..."
 
-#: ../src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "PM:"
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Jugar"
 
-#: ../src/net/tmwa/chathandler.cpp:190
-msgid "MVP player."
-msgstr "Jugador VIP."
+#: src/gui/updatewindow.cpp:405
+msgid "##1  The update process is incomplete."
+msgstr "##3  El proceso de actualización esta incompleto."
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
-msgid "Male"
-msgstr "Hombre"
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
+msgid "##1  It is strongly recommended that"
+msgstr "##1 Es altamente recomendado que"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Mapa"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
+msgstr "##1 lo intentes de nuevo más tarde."
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
-#, c-format
-msgid "Map: %s"
-msgstr "Mapa: %s"
+#: src/gui/updatewindow.cpp:501
+msgid "Completed"
+msgstr "Completado"
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Máximo"
+#: src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Listas de usuarios en el canal"
 
-#: ../src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Media"
+#: src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Poner un tema en el canal"
 
-#: ../src/gui/socialwindow.cpp:157
-msgid "Member Invite to Guild"
-msgstr "Miembro invitado al clan."
+#: src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Salir del canal"
 
-#: ../src/gui/socialwindow.cpp:236
-msgid "Member Invite to Party"
-msgstr "Invitación de un miembro al grupo"
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Hacer a un usuario operador del canal"
 
-#: ../src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Estado del miembro fue cambiado satisfactoriamente."
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Expulsar un usuario del canal"
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Mensaje"
+#: src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Comando: /users"
 
-#: ../src/commandhandler.cpp:480
-msgid "Message closes chat."
-msgstr "El mensaje cierra el chat."
+#: src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Mostrar los usuarios en este canal."
 
-#: ../src/commandhandler.cpp:493
-msgid "Message now closes chat."
-msgstr "Mensaje ahora cierra el chat."
+#: src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Comando: /topic <mensaje>"
 
-#: ../src/keyboardconfig.cpp:75
-msgid "Minimap Window"
-msgstr "Ventana del minimapa"
+#: src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Este comando establece el tema a <mensaje> ."
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
-#, c-format
-msgid "Minimap: %s"
-msgstr "Minimapa: %s"
+#: src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Comando: /quit"
 
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Muchos fallos al atacar"
+#: src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Salir del canal."
 
-#: ../src/gui/statuswindow.cpp:224
-msgid "Money"
-msgstr "Dinero"
+#: src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Si eres la última persona de este canal , será eliminado."
 
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
-#, c-format
-msgid "Money: %s"
-msgstr "Dinero: %s"
+#: src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Comando: /op <nick>"
 
-#: ../src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr "Cuando un monstruo te ataca"
+#: src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Hacer al jugador <nick> operador del canal."
 
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Monstruos"
+#: src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
+msgstr ""
+"Los operadores pueden expulsar y hace operadores a otros jugadores en el "
+"canal."
 
-#: ../src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Mover para abajo"
+#: src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Comando: /kick <nick>"
 
-#: ../src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Izquierda"
+#: src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Expulsar <nick> del canal."
 
-#: ../src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Derecha"
+#: src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr "Se necesita un usuario para ser operador!"
 
-#: ../src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Mover para arriba"
+#: src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Se necesita un usuario a expulsar!"
 
-#: ../src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Volumen de Música"
+#: src/gui/widgets/chattab.cpp:118
+msgid "Global announcement:"
+msgstr "Anuncio global:"
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
-msgid "Music: %s"
-msgstr "Música: %s"
+msgid "Global announcement from %s:"
+msgstr "Anuncio global de  %s:"
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: src/gui/widgets/chattab.cpp:150
+#, c-format
+msgid "%s whispers: %s"
+msgstr "%s envía mensaje privado: %s"
 
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPCs"
+#: src/gui/widgets/whispertab.cpp:51
+msgid "Cannot send empty chat!"
+msgstr "No puedes enviar un mensaje vacío!"
 
-#: ../src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Nombre"
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr "/ignore > Ignora al jugador"
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Nombre:"
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr "/unignore > Parar de ignorar al jugador"
 
-#: ../src/gui/unregisterdialog.cpp:51
-#, c-format
-msgid "Name: %s"
-msgstr "Nombre: %s"
+#: src/gui/widgets/whispertab.cpp:72
+msgid "/close > Close the whisper tab"
+msgstr "/close > Cierra la pestaña de mensajes"
 
-#: ../src/gui/ministatus.cpp:157
-msgid "Need"
-msgstr "Necesitas"
+#: src/gui/widgets/whispertab.cpp:82
+msgid "Command: /close"
+msgstr "Comando: /close"
 
-#: ../src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Se necesita un usuario a expulsar!"
+#: src/gui/widgets/whispertab.cpp:83
+msgid "This command closes the current whisper tab."
+msgstr "Este comando cierra la pestaña de mensajes actual"
 
-#: ../src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
-msgstr "Se necesita un usuario para ser operador!"
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
+msgstr "Comando: /ignore"
 
-#: ../src/game.cpp:372
-msgid "Network Error"
-msgstr "Error de conexión"
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+"Este comando ignora a otro jugador independientemente de la relación actual "
+"con él."
 
-#: ../src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutral"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Este comando para de ignorar al jugador si había sido ignorado."
 
-#: ../src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr "Nuevo e-mail incorrecto."
+#: src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Status"
 
-#: ../src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr "Nueva contraseña incorrecta."
+#: src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Atajo"
 
-#: ../src/net/tmwa/loginhandler.cpp:92
-msgid "New password too short."
-msgstr "Nueva contrasena es muy corta."
+#: src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr "Seleccionar Mundo"
 
-#: ../src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Siguiente"
+#: src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
+msgstr "Cambiar de Login"
 
-#: ../src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Siguiente Pestaña De Chat"
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr "Escojer Mundo"
 
-#: ../src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "No"
+#: src/keyboardconfig.cpp:40
+msgid "Move Up"
+msgstr "Mover para arriba"
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
-msgstr ""
+#: src/keyboardconfig.cpp:41
+msgid "Move Down"
+msgstr "Mover para abajo"
 
-#: ../src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
-msgstr "Sin espacios"
+#: src/keyboardconfig.cpp:42
+msgid "Move Left"
+msgstr "Izquierda"
 
-#: ../src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "No hay servidores disponibles."
+#: src/keyboardconfig.cpp:43
+msgid "Move Right"
+msgstr "Derecha"
 
-#: ../src/net/tmwa/generalhandler.cpp:132
-msgid "No servers available."
-msgstr "Servidores indiponibles."
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+msgid "Attack"
+msgstr "Atacar"
 
-#: ../src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Sin texto"
+#: src/keyboardconfig.cpp:45
+msgid "Target & Attack"
+msgstr "Seleccionar & Atacar"
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"No, niños. Tu jugador no murió realmente. Solo... eeeh... fue a un lugar "
-"mejor ."
+#: src/keyboardconfig.cpp:46
+msgid "Smilie"
+msgstr "Emoticono"
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
-msgid "None"
-msgstr "Nada"
+#: src/keyboardconfig.cpp:47
+msgid "Talk"
+msgstr "Hablar"
 
-#: ../src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "No se está grabando en este momento."
+#: src/keyboardconfig.cpp:48
+msgid "Stop Attack"
+msgstr "Parar el ataque"
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
-msgid "Not logged in."
-msgstr "No estás conectado."
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
+msgstr "Seleccionar Monstruo"
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Nada que vender."
+#: src/keyboardconfig.cpp:50
+msgid "Target NPC"
+msgstr "Seleccionar NPC"
 
-#: ../src/gui/setup_audio.cpp:94
-msgid "Notice"
-msgstr "Anuncio"
+#: src/keyboardconfig.cpp:51
+msgid "Target Player"
+msgstr "Seleccionar Jugador"
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
-msgid "OK"
-msgstr "OK"
+#: src/keyboardconfig.cpp:52
+msgid "Pickup"
+msgstr "Coger"
 
-#: ../src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr "E-mail antiguo incorrecto."
+#: src/keyboardconfig.cpp:53
+msgid "Hide Windows"
+msgstr "Esconder ventanas"
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
-msgid "Old password incorrect."
-msgstr "Contrasena antigua incorrecta."
+#: src/keyboardconfig.cpp:54
+msgid "Sit"
+msgstr "Sentarse"
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr "Un stat es 0."
+#: src/keyboardconfig.cpp:55
+msgid "Screenshot"
+msgstr "Imprimir pantalla"
 
-#: ../src/net/tmwa/gamehandler.cpp:87
-#, c-format
-msgid "Online users: %d"
-msgstr "Jugadores online: %d"
+#: src/keyboardconfig.cpp:56
+msgid "Enable/Disable Trading"
+msgstr "Habilitar/Desabilitar intercambios"
 
-#: ../src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/keyboardconfig.cpp:57
+msgid "Find Path to Mouse"
+msgstr "Encontrar Camino al Mouse"
 
-#: ../src/commandhandler.h:31
+#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
+#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgid "Item Shortcut %d"
+msgstr "Atajo para el objeto %d"
 
-#: ../src/main.cpp:43
-msgid "Options:"
-msgstr "Opciones:"
+#: src/keyboardconfig.cpp:70
+msgid "Help Window"
+msgstr "Ventana de ayuda"
 
-#: ../src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr "Cuando atacan a otros montruos"
+#: src/keyboardconfig.cpp:71
+msgid "Status Window"
+msgstr "Ventana de status"
 
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Nombres de otros jugadores"
+#: src/keyboardconfig.cpp:72
+msgid "Inventory Window"
+msgstr "Ventana de inventario"
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
-msgstr "Conjuntos: %d"
+#: src/keyboardconfig.cpp:73
+msgid "Equipment Window"
+msgstr "Ventana de equipamento"
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr "Conjuntos"
+#: src/keyboardconfig.cpp:74
+msgid "Skill Window"
+msgstr "Ventana de habilidades"
 
-#: ../src/keyboardconfig.cpp:82
-msgid "Outfits Window"
-msgstr "Ventana de Conjuntos"
+#: src/keyboardconfig.cpp:75
+msgid "Minimap Window"
+msgstr "Ventana del minimapa"
 
-#: ../src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr "Texto sobrescrito"
+#: src/keyboardconfig.cpp:76
+msgid "Chat Window"
+msgstr "Ventana de Chat"
 
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Propio Nombre"
+#: src/keyboardconfig.cpp:77
+msgid "Item Shortcut Window"
+msgstr "Ventana de atajos para objetos"
 
-#: ../src/gui/setup_video.cpp:615
-msgid "Particle Effect Settings Changed."
-msgstr "Configuración del efecto de las partículas cambiado."
+#: src/keyboardconfig.cpp:78
+msgid "Setup Window"
+msgstr "Ventana de Configuración"
 
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Efectos Particulares"
+#: src/keyboardconfig.cpp:79
+msgid "Debug Window"
+msgstr "Ventana de Problemas"
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
-#, c-format
-msgid "Particle count: %d"
-msgstr "Recuento de partículas: %d"
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr "Ventana Social"
 
-#: ../src/gui/setup_video.cpp:263
-msgid "Particle detail"
-msgstr "Detalle de partículas"
+#: src/keyboardconfig.cpp:81
+msgid "Emote Shortcut Window"
+msgstr "Ventana de Emoticonos"
 
-#: ../src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
-msgstr "Detalle de partícula: %s"
+#: src/keyboardconfig.cpp:82
+msgid "Outfits Window"
+msgstr "Ventana de Conjuntos"
 
-#: ../src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Efectos de partículas"
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr "Ponerse el conjunto"
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Grupo"
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr "Copiar el conjunto"
 
-#: ../src/gui/socialwindow.cpp:222
+#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
-msgid "Party %s quit requested."
-msgstr "Grupo %s requisitado."
+msgid "Emote Shortcut %d"
+msgstr "Atajo para Emoticono %d"
 
-#: ../src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr "Miembros del grupo"
+#: src/keyboardconfig.cpp:97
+msgid "Toggle Chat"
+msgstr "Cambiar de Chat"
 
-#: ../src/gui/socialwindow.cpp:629
-msgid "Party Name"
-msgstr "Nombre del grupo"
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Up"
+msgstr "Tirar el chat para arriba"
 
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Falta el nombre del grupo."
+#: src/keyboardconfig.cpp:99
+msgid "Scroll Chat Down"
+msgstr "Tirar el chat para abajo"
 
-#: ../src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Grupo creado."
+#: src/keyboardconfig.cpp:100
+msgid "Previous Chat Tab"
+msgstr "Pestaña de Chat Anterior"
 
-#: ../src/gui/beingpopup.cpp:76
-#, c-format
-msgid "Party: %s"
-msgstr "Grupo: %s"
+#: src/keyboardconfig.cpp:101
+msgid "Next Chat Tab"
+msgstr "Siguiente Pestaña De Chat"
 
-#: ../src/client.cpp:885
-msgid "Password Change"
-msgstr "Cambiar contraseña"
+#: src/keyboardconfig.cpp:102
+msgid "Select OK"
+msgstr "Seleccionar OK"
 
-#: ../src/client.cpp:886
-msgid "Password changed successfully!"
-msgstr "Le contraseña se cambió correctamente!"
+#: src/keyboardconfig.cpp:104
+msgid "Ignore input 1"
+msgstr "Ignorar input 1"
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Contraseña:"
+#: src/keyboardconfig.cpp:105
+msgid "Ignore input 2"
+msgstr "Ignorar input 2"
 
-#: ../src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Las contraseñas no coinciden."
+#: src/keyboardconfig.cpp:184
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
+"puede presentar un comportamiento raro."
+
+#: src/localplayer.cpp:914
+msgid "Unable to pick up item."
+msgstr "Imposible coger el objeto."
 
-#: ../src/gui/popupmenu.cpp:188
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:923
 #, c-format
-msgid "Pick up %s"
-msgstr "Coger %s"
+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/keyboardconfig.cpp:52
-msgid "Pickup"
-msgstr "Coger"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
+msgstr "mana  [opciones] [archivo-mana]"
 
-#: ../src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "Aviso al cojer un objeto"
+#: src/main.cpp:44
+msgid "Options:"
+msgstr "Opciones:"
 
-#: ../src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Jugar"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        :  Muestra la versión"
 
-#: ../src/commandhandler.cpp:545
-msgid "Player already ignored!"
-msgstr "El jugador ya está ignorado!"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Muestra la ayuda"
 
-#: ../src/commandhandler.cpp:554
-msgid "Player could not be ignored!"
-msgstr "El jugador no puede ser ignorado!"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Carpeta de Configuración a usar"
 
-#: ../src/commandhandler.cpp:576
-msgid "Player could not be unignored!"
-msgstr "El jugador no puede ser devuelto al estado normal!"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Acceder con este nombre de usuario"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-msgid "Player deleted."
-msgstr "Personaje eliminado."
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Acceder con la contraseña"
 
-#: ../src/commandhandler.cpp:574
-msgid "Player no longer ignored!"
-msgstr "El jugador ha sido devuelto al estado normal!"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Acceder con este jugador"
 
-#: ../src/commandhandler.cpp:552
-msgid "Player successfully ignored!"
-msgstr "Jugador ignorado!"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         :  Login server o IP"
 
-#: ../src/commandhandler.cpp:569
-msgid "Player wasn't ignored!"
-msgstr "El jugador no estaba ignorado!"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Puerto del servidor"
 
-#: ../src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Jugadores"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
+msgstr "     --update-host    : Usar este host de actualización"
 
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr "Jugadores en este canal:"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Escoje el personaje por defecto y el servidor"
 
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Por favor distribuya %d puntos"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Saltarse las actualizaciones"
 
-#: ../src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Por favor extraiga %d puntos de estado"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Carpeta por donde cargar los datos del juego"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
-msgid "Please specify a name."
-msgstr "Por favor, especifique un nombre."
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
 
-#: ../src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Por favor especifique el nombre y el puerto del servidor."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Carpeta donde guardar los screenshots"
 
-#: ../src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Veneno no tuvo ningún efecto..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "     --no-opengl      :  Deshabilita OpenGL en esta sesion"
 
-#: ../src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Puerto:"
+#: src/net/ea/adminhandler.cpp:63
+msgid "Kick failed!"
+msgstr "Error al expulsar!"
 
-#: ../src/gui/serverdialog.cpp:452
-msgid "Preparing download"
-msgstr "Preparando la descarga"
+#: src/net/ea/adminhandler.cpp:65
+msgid "Kick succeeded!"
+msgstr "Expulsado satisfactoriamente!"
 
-#: ../src/gui/chat.cpp:307
-#, c-format
-msgid "Present: %s; %d players are present."
-msgstr "Presentes: %s; %d jugadores estan presentes."
+#: src/net/ea/buysellhandler.cpp:110
+msgid "Nothing to sell."
+msgstr "Nada que vender."
 
-#: ../src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr "Pulsa OK para reaparecer."
+#: src/net/ea/buysellhandler.cpp:117
+msgid "Thanks for buying."
+msgstr "Gracias por comprar."
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Aprieta el botón para empezar a calibrar"
+#: src/net/ea/buysellhandler.cpp:124
+msgid "Unable to buy."
+msgstr "Imposible comprar."
 
-#: ../src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "Pestaña de Chat Anterior"
+#: src/net/ea/buysellhandler.cpp:130
+msgid "Thanks for selling."
+msgstr "Gracias por vender."
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Precio: %s / Total: %s"
+#: src/net/ea/buysellhandler.cpp:132
+msgid "Unable to sell."
+msgstr "Imposible vender."
 
-#: ../src/playerrelations.cpp:326
-msgid "Print '...'"
-msgstr "Imprimir '...'"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
+msgstr "Acesso denegado."
 
-#: ../src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Proponer el intercambio"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr "Imposible usar esta ID."
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Pulso"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
+msgstr "Error desconocido al seleccionar este jugador."
 
-#: ../src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr "Mostrar nuevos susurros en pestañas"
+#: src/net/ea/charserverhandler.cpp:135
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Error al crear personaje. Probablemente ya esté en uso."
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Salir"
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
+msgid "Info"
+msgstr "Información"
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Arcoiris"
+#: src/net/ea/charserverhandler.cpp:147
+msgid "Character deleted."
+msgstr "Personaje Borrado."
 
-#: ../src/gui/socialwindow.cpp:556
-msgid "Received guild request, but one already exists."
-msgstr "Recibida petición de creación del clan, pero ya existe."
+#: src/net/ea/charserverhandler.cpp:152
+msgid "Failed to delete character."
+msgstr "Fallo al borrar el personaje."
 
-#: ../src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr "Recibida petición de creación del grupo, pero ya existe."
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+msgid "Strength:"
+msgstr "Fuerza:"
 
-#: ../src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Grabando..."
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+msgid "Agility:"
+msgstr "Agilidad:"
 
-#: ../src/gui/setup_colors.cpp:108
-msgid "Red:"
-msgstr "Rojo:"
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+msgid "Vitality:"
+msgstr "Vitalidad:"
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
-msgid "Register"
-msgstr "Registrar"
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+msgid "Intelligence:"
+msgstr "Inteligencia:"
 
-#: ../src/gui/login.cpp:129
-msgid "Registration disabled"
-msgstr "Registro desabilitado."
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+msgid "Dexterity:"
+msgstr "Destreza:"
 
-#: ../src/net/tmwa/loginhandler.cpp:165
-msgid "Rejected from server."
-msgstr "Rechazado del servidor."
+#: src/net/ea/charserverhandler.cpp:242
+msgid "Luck:"
+msgstr "Suerte:"
 
-#: ../src/gui/socialwindow.cpp:472
-#, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Cancelada la invitación a la guild de %s."
+#: src/net/ea/chathandler.cpp:80
+msgid "Whisper could not be sent, user is offline."
+msgstr "Imposible enviar mensaje, usuario desconectado."
 
-#: ../src/gui/socialwindow.cpp:453
-#, c-format
-msgid "Rejected party invite from %s."
-msgstr "Cancelada la invitación de  %s."
+#: src/net/ea/chathandler.cpp:84
+msgid "Whisper could not be sent, ignored by user."
+msgstr "Imposible enviar mensaje, estás ignorado por el otro jugador."
 
-#: ../src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Relación"
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
+msgstr "Jugador VIP."
 
-#: ../src/gui/login.cpp:60
-msgid "Remember username"
-msgstr "Recordar nombre de usuario"
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+msgid "Channels are not supported!"
+msgstr "Canales no son soportados!"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Propuesta de intercambio"
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr "Jugadores online: %d"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Game"
+msgstr "Juego"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/net/ea/gamehandler.cpp:100
 msgid "Request to quit denied!"
 msgstr "Petición de salida denegada!"
 
-#: ../src/client.cpp:774
-msgid "Requesting characters"
-msgstr "Cargando jugadores"
-
-#: ../src/client.cpp:858
-msgid "Requesting registration details"
-msgstr "Detalles de registración"
-
-#: ../src/commandhandler.cpp:436
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr "Solicitando la entrada del canal %s."
-
-#: ../src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Resetear"
-
-#: ../src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Restaurar Ventanas"
+msgid "Strength %+d"
+msgstr "Fuerza %+d"
 
-#: ../src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr "Reinicio necesario para que los cambios tengan su efecto."
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#, c-format
+msgid "Agility %+d"
+msgstr "Agilidad %+d"
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "Reincie el juego para que los cambios tengan efecto."
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#, c-format
+msgid "Vitality %+d"
+msgstr "Vitalidad %+d"
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Retirar"
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Inteligencia %+d"
 
-#: ../src/commandhandler.cpp:489
-msgid "Return now toggles chat."
-msgstr "Volver ahora a cambiar de chat."
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Destreza %+d"
 
-#: ../src/commandhandler.cpp:480
-msgid "Return toggles chat."
-msgstr "Volver a alternar el chat."
+#: src/net/ea/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
+msgstr "Suerte %+d"
 
-#: ../src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Gira el stick"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
+msgstr "Fallo en la autentificación."
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Desgraciadamente, nada de ti fue encontrado..."
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
+msgstr "Servidores indiponibles."
 
-#: ../src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Fallo al guardar screenshot!"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
+msgstr "Alguien está intentando usar tu cuenta."
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
-msgid "Screen Resolution Changed"
-msgstr "Resolución de pantalla cambiada"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
+msgstr "Ya hay alguien conectado con esta cuenta."
 
-#: ../src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Imprimir pantalla"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
+msgstr "Hack de velocidad detectado."
 
-#: ../src/game.cpp:333
-msgid "Screenshot saved as "
-msgstr "Screenshot guardada como"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
+msgstr "Login duplicado."
 
-#: ../src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Tirar el chat para abajo"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
+msgstr "Error de conexión desconocido."
 
-#: ../src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Tirar el chat para arriba"
+#: src/net/ea/generalhandler.cpp:205
+msgid "Got disconnected from server!"
+msgstr "Desconectado del servidor!"
 
-#: ../src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Parece que necesitas más dinero... ;-)"
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr "Fuerza"
 
-#: ../src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "Seleccionar OK"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
+msgstr "Agilidad"
 
-#: ../src/gui/worldselectdialog.cpp:71
-msgid "Select World"
-msgstr "Seleccionar Mundo"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
+msgstr "Vitalidad"
 
-#: ../src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Selecionar cantidad de objetos a tirar."
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
+msgstr "Inteligencia"
 
-#: ../src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
-msgstr "Selecciona la cantidad de objetos a retirar."
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
+msgstr "Destreza"
 
-#: ../src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Selecionar la cantidad de objetos para dividir."
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "Suerte"
 
-#: ../src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Seleccione la cantidad de objetos a almacenar."
+#: src/net/ea/generalhandler.cpp:224
+msgid "Defense"
+msgstr "Defensa"
 
-#: ../src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Selecionar la cantidad de objetos a intercambiar."
+#: src/net/ea/generalhandler.cpp:225
+msgid "M.Attack"
+msgstr "Ataque M."
 
-#: ../src/net/manaserv/charhandler.cpp:205
-msgid "Selection out of range."
-msgstr "Seleccion fuera de rango."
+#: src/net/ea/generalhandler.cpp:226
+msgid "M.Defense"
+msgstr "Defensa M."
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Vender"
+#: src/net/ea/generalhandler.cpp:227
+msgid "% Accuracy"
+msgstr "% Puntería"
 
-#: ../src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Enviar"
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
+msgstr "% Evasión"
 
-#: ../src/gui/serverdialog.cpp:211
-msgid "Server type:"
-msgstr "Tipo de servidor:"
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr "% Crítico"
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Servidor:"
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Clan"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Configuración"
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Para la ayuda."
 
-#: ../src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Ventana de Configuración"
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invita un jugador a tu clan"
 
-#: ../src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Volumen Sfx"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Deja el clan en la que estas"
 
-#: ../src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Tienda"
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa a alguien del clan en el que estás."
 
-#: ../src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Atajo"
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
-msgid "Show IP: Off"
-msgstr "Mostrar IP: Cancelado"
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Este comando invita a <nick> para el clan en el que estás ."
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
-msgid "Show IP: On"
-msgstr "Mostrar IP: Activado"
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Comando: /leave"
 
-#: ../src/gui/setup_video.cpp:254
-#, fuzzy
-msgid "Show damage"
-msgstr "mostrar nombre"
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando hace que dejes el clan."
 
-#: ../src/gui/setup_players.cpp:232
-msgid "Show gender"
-msgstr "Mostrar género (del personaje)"
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr "Falta el nombre del clan."
 
-#: ../src/gui/setup_video.cpp:227
-msgid "Show own name"
-msgstr "Mostrar nombre propio"
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr "No se puede invitar jugadores al clan."
 
-#: ../src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
-msgstr "Mostrar aviso al coger algo"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr "El jugador cancel la invitacion a tu guild."
 
-#: ../src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "Sentarse"
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr "El usuario es ahora de tu clan."
 
-#: ../src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Fallo al sentarse!"
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr "Tu clan está lleno."
 
-#: ../src/gui/skilldialog.cpp:362
-#, c-format
-msgid "Skill %d"
-msgstr "Habilidad %d"
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr "Invitación desconocida a una guild."
 
-#: ../src/gui/skilldialog.cpp:353
-#, c-format
-msgid "Skill Set %d"
-msgstr "Habilidades %d"
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr "La creación de guilds no esta soportada."
 
-#: ../src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Ventana de habilidades"
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Grupo"
 
-#: ../src/gui/skilldialog.cpp:271
-#, c-format
-msgid "Skill points available: %d"
-msgstr "Puntos de habilidades: %d"
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Invita un jugador a tu grupo"
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Habilidades"
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Salir del grupo en el que estás"
 
-#: ../src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr "Espacios:"
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Expulsa a alguien del grupo en el que estás"
 
-#: ../src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Pequeño"
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Mostrar/Cambiar el compartir objetos en el grupo"
 
-#: ../src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Emoticono"
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Mostrar/Modificar el compartir experiencia en el grupo "
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
-msgid "Social"
-msgstr "Social"
+#: src/net/ea/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Este comando hace que dejes el grupo."
 
-#: ../src/keyboardconfig.cpp:80
-msgid "Social Window"
-msgstr "Ventana Social"
+#: src/net/ea/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Comando> /item <policy>"
 
-#: ../src/gui/setup_video.cpp:582
-msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
+#: src/net/ea/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr "Este comando cambia el compatir objetos en el grupo."
 
-#: ../src/net/tmwa/generalhandler.cpp:136
-msgid "Someone else is trying to use this account."
-msgstr "Alguien está intentando usar tu cuenta."
+#: src/net/ea/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<policy> puede ser \"1\", \"yes\" y \"true\" para habilitar el compartir "
+"objetos, o \"0\", \"no\" y \"false\" para deshabilitar."
 
-#: ../src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Sonido"
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Comando: /item"
 
-#: ../src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr "Mecanismo de Sonido"
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr "Este comando muestra el actual estado de compartir objetos en el grupo"
 
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr "Especial %d"
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Comando: /exp <policy>"
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr "Especiales"
+#: src/net/ea/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr "Este comando cambia la opción de compartir experiencia del grupo."
 
-#: ../src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr "Especiales %d"
+#: src/net/ea/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<policy> puede ser \"1\", \"yes\" y \"true\" para habilitar compartir "
+"experiencia, o \"0\", \"no\" y \"false\" para deshabilitar."
 
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Espectro"
+#: src/net/ea/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Comando: /exp"
 
-#: ../src/net/tmwa/generalhandler.cpp:142
-msgid "Speed hack detected."
-msgstr "Hack de velocidad detectado."
+#: src/net/ea/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+"Este comando muestra el actual estado de compartir experiencia del grupo."
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
-msgid "Split"
-msgstr "Dividir"
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+msgid "Item sharing enabled."
+msgstr "Compartir objetos habilitado."
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
-msgstr ""
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+msgid "Item sharing disabled."
+msgstr "Compartir objetos desabilitado."
 
-#: ../src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Iniciando la grabación..."
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+msgid "Item sharing not possible."
+msgstr "No es posible el compartir objetos."
 
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Estático"
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr "Compartir objetos desconocido."
 
-#: ../src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Status"
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+msgid "Experience sharing enabled."
+msgstr "Compartir experiencia activado."
 
-#: ../src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Ventana de status"
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+msgid "Experience sharing disabled."
+msgstr "Compartir experiencia desactivado ."
 
-#: ../src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Parar"
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+msgid "Experience sharing not possible."
+msgstr "Imposible compartir experiencia."
 
-#: ../src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Parar el ataque"
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
+msgstr "Compartir experiencia desconocido."
 
-#: ../src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Parar de grabar"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
+msgstr "Fallo al usar el objeto."
 
-#: ../src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Almacén"
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
+msgstr "Imposible equipar."
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
-msgid "Store"
-msgstr "Almacenar"
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
+msgstr "Imposible quitárselo."
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Fuerza"
+#: src/net/ea/loginhandler.cpp:79
+msgid "Account was not found. Please re-login."
+msgstr "Cuenta no encontrada. Por favor conéctate de nuevo."
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Fuerza %+d"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
+msgstr "Contrasena antigua incorrecta."
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Fuerza:"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
+msgstr "Nueva contrasena es muy corta."
 
-#: ../src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Enviar"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
+msgstr "Error desconocido."
 
-#: ../src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr "Salir del Login"
+#: src/net/ea/loginhandler.cpp:149
+msgid "Unregistered ID."
+msgstr "ID no registrada."
 
-#: ../src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Cambiar de personaje"
+#: src/net/ea/loginhandler.cpp:152
+msgid "Wrong password."
+msgstr "Contrasena incorrecta."
 
-#: ../src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Cambiar de servidor"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
+msgstr "La cuenta expiró."
 
-#: ../src/gui/setup_video.cpp:445
-msgid "Switching to Full Screen"
-msgstr "Cambiando a pantalla completa"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
+msgstr "Rechazado del servidor."
 
-#: ../src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Hablar"
+#: src/net/ea/loginhandler.cpp:161
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
+"GM."
 
-#: ../src/gui/popupmenu.cpp:150
+#: src/net/ea/loginhandler.cpp:165
 #, c-format
-msgid "Talk to %s"
-msgstr "Hablar con %s"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Has sido baneado temporalmente del juego %s.\n"
+"Por favor contacta un GM de nuestro equipo via el foro."
 
-#: ../src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Seleccionar & Atacar"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr "Este nombre de usuario ya está escogido."
 
-#: ../src/keyboardconfig.cpp:49
-msgid "Target Monster"
-msgstr "Seleccionar Monstruo"
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr "Adress vacía enviada a Network::connect()!"
 
-#: ../src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "Seleccionar NPC"
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr "No es posible determinar el host \""
 
-#: ../src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Seleccionar Jugador"
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr "Conexión al servidor terminada."
 
-#: ../src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Texto"
+#: src/net/ea/partyhandler.cpp:81
+msgid "Could not create party."
+msgstr "No es posible crear un grupo."
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Gracias por comprar."
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Grupo creado."
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Gracias por vender."
+#: src/net/ea/partyhandler.cpp:118
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s ya es miembro de otro grupo."
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Las frías manos de la muerte se llevaron tu alma su reino."
+#: src/net/ea/partyhandler.cpp:122
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s cancelo tu invitación."
 
-#: ../src/game.cpp:368
-msgid "The connection to the server was lost."
-msgstr "Se ha perdido la conexión del servidor."
+#: src/net/ea/partyhandler.cpp:126
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s ahora es un miembro de tu grupo."
 
-#: ../src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
-msgstr "Los e-mail son distintos."
+#: src/net/ea/partyhandler.cpp:130
+#, c-format
+msgid "Unknown invite response for %s."
+msgstr "Invitacion desconocida para %s."
 
-#: ../src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr "El nuevo e-mail ya existe."
+#: src/net/ea/partyhandler.cpp:238
+msgid "You have left the party."
+msgstr "Has dejado el grupo."
 
-#: ../src/gui/changeemaildialog.cpp:127
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "El nuevo email debe tener como mínimo %d caracteres."
+msgid "%s has left your party."
+msgstr "%s dejó tu grupo."
 
-#: ../src/gui/changeemaildialog.cpp:134
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "El nuevo email debe tener como máximo %d caracteres."
+msgid "An unknown member tried to say: %s"
+msgstr "Un miembro desconocido intentó decir: %s"
 
-#: ../src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
-msgstr "Las nuevas contraseñas no concuerdan."
+#: src/net/ea/partyhandler.cpp:329
+msgid "Inviting like this isn't supported at the moment."
+msgstr "Invitar así no esta soportado por el momento."
 
-#: ../src/gui/changepassworddialog.cpp:116
-#, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "La nueva contraseña debe tener como mínimo %d caracteres."
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr "Sólo puedes invitar cuando estés en un grupo!"
 
-#: ../src/gui/changepassworddialog.cpp:123
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "La nueva contraseña debe tener como máximo %d caracteres."
+msgid "%s is not in your party!"
+msgstr "%s no está en tu grupo!"
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
-#, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "La contraseña debe tener al menos %d caracteres."
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+msgid "You are dead."
+msgstr "Estás muerto"
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
-#, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "La contraseña debe tener como mínimo %d caracteres."
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate."
 
-#: ../src/gui/register.cpp:166
-#, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "El nombre debe tener como mínimo %d caracteres."
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+msgid "You are not that alive anymore."
+msgstr "Ya no estás tan vivo..."
 
-#: ../src/gui/register.cpp:174
-#, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "El nombre debe tener menos de  %d caracteres."
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Las frías manos de la muerte se llevaron tu alma su reino."
 
-#: ../src/net/tmwa/generalhandler.cpp:139
-msgid "This account is already logged in."
-msgstr "Ya hay alguien conectado con esta cuenta."
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+msgid "Game Over!"
+msgstr "Fin Del Juego!"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
-msgstr "Este comando hace que dejes el clan."
+#: src/net/ea/playerhandler.cpp:105
+msgid "Insert coin to continue."
+msgstr "Inserta moneda para continuar."
 
-#: ../src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Este comando hace que dejes el grupo."
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"No, niños. Tu jugador no murió realmente. Solo... eeeh... fue a un lugar "
+"mejor ."
 
-#: ../src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "Este comando cambia la opción de compartir experiencia del grupo."
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Parece que tu plan de romper las armas de tus enemigos con tu garganta falló!"
 
-#: ../src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr "Este comando cambia el compatir objetos en el grupo."
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+msgid "I guess this did not run too well."
+msgstr "Creo que esto no fue muy bien."
 
-#: ../src/commandhandler.cpp:275
-msgid "This command clears the away status and message."
-msgstr "Este comando limpia el status y los mensajes \"away\"."
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+msgid "Do you want your possessions identified?"
+msgstr "Deseas que tus posesiones sean identificadas?"
 
-#: ../src/commandhandler.cpp:229
-msgid "This command clears the chat log of previous chat."
-msgstr "Este comando limpia la pestaña actual del chat previo."
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Desgraciadamente, nada de ti fue encontrado..."
 
-#: ../src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "Este comando cierra la pestaña de mensajes actual"
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+msgid "Annihilated."
+msgstr "Aniquilado."
 
-#: ../src/commandhandler.cpp:280
-msgid "This command creates a new party called <name>."
-msgstr "Este comando crea un nuevo grupo llamado <nombre>."
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+msgid "Looks like you got your head handed to you."
+msgstr "Parece que te tiraron tu cabeza a tus manos."
 
-#: ../src/commandhandler.cpp:210
-msgid "This command displays a list of all commands available."
-msgstr "Para ver la lista de comandos disponibles."
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Parece que te asustaste , revive en otro cuerpo y sigue tu aventura ."
 
-#: ../src/commandhandler.cpp:213
-msgid "This command displays help on <command>."
-msgstr "Para ver la ayuda en <comando>"
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're not dead yet. You're just resting."
+msgstr "Tu no estás muerto. Sólo estás descansando."
 
-#: ../src/commandhandler.cpp:324
-msgid "This command displays the name of the current map."
-msgstr "Muestra el nombre del mapa actual."
+#: src/net/ea/playerhandler.cpp:124
+msgid "You are no more."
+msgstr "Tu ya no existes más."
 
-#: ../src/commandhandler.cpp:329
-msgid "This command displays the number of players currently online."
-msgstr "Este comando muestra el número de jugadores que están en línea."
+#: src/net/ea/playerhandler.cpp:125
+msgid "You have ceased to be."
+msgstr "Parece que dejaste de existir."
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr ""
-"Este comando muestra el actual estado de compartir experiencia del grupo."
+#: src/net/ea/playerhandler.cpp:126
+msgid "You've expired and gone to meet your maker."
+msgstr "Has expirado e ido a ver al tu creador."
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr "Este comando muestra el actual estado de compartir objetos en el grupo"
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're a stiff."
+msgstr "Eres un cadáver."
 
-#: ../src/commandhandler.cpp:313
-msgid "This command displays the return toggle status."
-msgstr "Este comando muestra el estado de alternar retorno."
+#: src/net/ea/playerhandler.cpp:128
+msgid "Bereft of life, you rest in peace."
+msgstr "Sin vida, descansa en paz."
 
-#: ../src/commandhandler.cpp:302
-msgid "This command finishes a recording session."
-msgstr "Este comando termina una sesión de grabación."
+#: src/net/ea/playerhandler.cpp:129
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "Si no estuvieras tan animado, diría que estás muerto."
+
+#: src/net/ea/playerhandler.cpp:130
+msgid "Your metabolic processes are now history."
+msgstr "Tus procesos metabólicos son ya historia."
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You're off the twig."
+msgstr "Estás fuera de tus botas."
 
-#: ../src/commandhandler.cpp:292
+#: src/net/ea/playerhandler.cpp:132
+msgid "You've kicked the bucket."
+msgstr "Te han echado a patadas."
+
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
 msgstr ""
-"Este comando recibe una lista de los jugadores dentro de la audición y la "
-"envía ya sea a la entrada de registro cuando el registro del chat está "
-"activado o el registro de conversaciones (pestaña de chat) de otro modo."
+"Has dejado tu cuerpo mortal, bajado las cortinas y unido al sangriento coro "
+"de los invisibles."
 
-#: ../src/commandhandler.cpp:234
-msgid "This command ignores the given player regardless of current relations."
-msgstr ""
-"Este comando es para ignorar al jugador indicado, independientemente de la "
-"relación actual."
+#: src/net/ea/playerhandler.cpp:135
+msgid "You are an ex-player."
+msgstr "Eres un ex-jugador."
 
-#: ../src/gui/widgets/whispertab.cpp:89
-msgid "This command ignores the other player regardless of current relations."
-msgstr ""
-"Este comando ignora a otro jugador independientemente de la relación actual "
-"con él."
+#: src/net/ea/playerhandler.cpp:136
+msgid "You're pining for the fjords."
+msgstr "Estas avanzando... hacia el barranco."
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Este comando invita al jugador <nick> a formar parte de tu grupo."
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+msgid "Message"
+msgstr "Mensaje"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Este comando invita a <nick> para el clan en el que estás ."
+#: src/net/ea/playerhandler.cpp:250
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
-#: ../src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Salir del canal."
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr "Has cogido %s."
 
-#: ../src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Hacer al jugador <nick> operador del canal."
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
+msgstr "Imposible incrementar!"
 
-#: ../src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Expulsar <nick> del canal."
+#: src/net/ea/playerhandler.cpp:532
+msgid "Equip arrows first."
+msgstr "Equipar las flechas primero."
 
-#: ../src/commandhandler.cpp:240
-msgid "This command makes you enter <channel>."
-msgstr "Este comando te hace entrar en <canal>."
+#: src/net/ea/specialhandler.cpp:147
+msgid "Trade failed!"
+msgstr "Fallo al intercambiar!"
 
-#: ../src/commandhandler.cpp:223
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Este comando envía un mensaje <mensaje> para todos los jugadores online."
+#: src/net/ea/specialhandler.cpp:150
+msgid "Emote failed!"
+msgstr "Fallo al hacer un emoticono!"
 
-#: ../src/commandhandler.cpp:258
-msgid "This command sends the text <message> to <nick>."
-msgstr "Este comando envía el texto <mensaje> para el jugador <nick>."
+#: src/net/ea/specialhandler.cpp:153
+msgid "Sit failed!"
+msgstr "Fallo al sentarse!"
 
-#: ../src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Este comando establece el tema a <mensaje> ."
+#: src/net/ea/specialhandler.cpp:156
+msgid "Chat creating failed!"
+msgstr "Fallo al crear un chat!"
 
-#: ../src/commandhandler.cpp:307
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Este comando determina si la tecla de retorno debe cambiar el registro de "
-"charla, o si el registro de charla se apaga automáticamente."
+#: src/net/ea/specialhandler.cpp:159
+msgid "Could not join party!"
+msgstr "Imposible entrar en un grupo!"
 
-#: ../src/commandhandler.cpp:246
-msgid "This command shows a list of all channels."
-msgstr "Este comando muestra una lista con todos los canales."
+#: src/net/ea/specialhandler.cpp:162
+msgid "Cannot shout!"
+msgstr "Imposible gritar!"
 
-#: ../src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Mostrar los usuarios en este canal."
+#: src/net/ea/specialhandler.cpp:171
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Usted no tiene suficiente nivel!"
 
-#: ../src/commandhandler.cpp:299
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr ""
-"Este comando inicia la grabación del chat en el archivo <nombre_del_archivo>."
+#: src/net/ea/specialhandler.cpp:174
+msgid "Insufficient HP!"
+msgstr "PV insuficiente!"
 
-#: ../src/commandhandler.cpp:318
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr "Este comando deja de ignorar a <jugador> si es ignorado"
+#: src/net/ea/specialhandler.cpp:177
+msgid "Insufficient SP!"
+msgstr "SP insuficiente!"
 
-#: ../src/gui/widgets/whispertab.cpp:95
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Este comando para de ignorar al jugador si había sido ignorado."
+#: src/net/ea/specialhandler.cpp:180
+msgid "You have no memos!"
+msgstr "No tienes ninguna nota armenzada!"
 
-#: ../src/commandhandler.cpp:251
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Este comando muestra a los otros lo que tú estas (haciendo) <mensaje>."
+#: src/net/ea/specialhandler.cpp:183
+msgid "You cannot do that right now!"
+msgstr "No puedes hacer esto ahora mismo!"
 
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr "Este comando muestra que no estas en el PC por una razon dada."
+#: src/net/ea/specialhandler.cpp:186
+msgid "Seems you need more money... ;-)"
+msgstr "Parece que necesitas más dinero... ;-)"
 
-#: ../src/commandhandler.cpp:266
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Este comando crea una pestaña para mensajes privados con el jugador <nick>."
+#: src/net/ea/specialhandler.cpp:189
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "No puedes usar estas habilidades con estas armas!"
 
-#: ../src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "Así es como se verá el color"
+#: src/net/ea/specialhandler.cpp:192
+msgid "You need another red gem!"
+msgstr "Necesitas otra Gema Roja!"
 
-#: ../src/net/tmwa/loginhandler.cpp:179
-msgid "This user name is already taken."
-msgstr "Este nombre de usuario ya está escogido."
+#: src/net/ea/specialhandler.cpp:195
+msgid "You need another blue gem!"
+msgstr "Necesitas otra Gema Azul!"
 
-#: ../src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Minúsculo"
+#: src/net/ea/specialhandler.cpp:198
+msgid "You're carrying to much to do this!"
+msgstr "Llevas muchas cosas para hacer esto!"
 
-#: ../src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "Para:"
+#: src/net/ea/specialhandler.cpp:201
+msgid "Huh? What's that?"
+msgstr "Huh? Qué es eso?"
 
-#: ../src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr "Cambiar de Chat"
+#: src/net/ea/specialhandler.cpp:210
+msgid "Warp failed..."
+msgstr "Fallo al teletransportar..."
+
+#: src/net/ea/specialhandler.cpp:213
+msgid "Could not steal anything..."
+msgstr "No puedes robar nada..."
+
+#: src/net/ea/specialhandler.cpp:216
+msgid "Poison had no effect..."
+msgstr "Veneno no tuvo ningún efecto..."
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
+msgid "Request for Trade"
+msgstr "Propuesta de intercambio"
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
-msgid "Topic: %s"
-msgstr "Tópico: %s"
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s quiere comerciar contigo, aceptas?"
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Intercambio"
+#: src/net/ea/tradehandler.cpp:124
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Intercambio es imposible. El otro personaje está muy alejado."
 
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Intercambio Cancelado."
+#: src/net/ea/tradehandler.cpp:128
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Intercambio imposible. El personaje no existe."
 
-#: ../src/net/tmwa/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Intercambio cancelado por una razón desconocida."
 
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Intercambio Realizado."
-
-#: ../src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Fallo al intercambiar!"
+#: src/net/ea/tradehandler.cpp:137
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Intercambio: Tú y %s"
 
-#: ../src/net/tmwa/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Intercambio con %s cancelado."
 
-#: ../src/gui/popupmenu.cpp:83
-#, c-format
-msgid "Trade with %s..."
-msgstr "Negociar con %s..."
+#: src/net/ea/tradehandler.cpp:153
+msgid "Unhandled trade cancel packet."
+msgstr "Intercambio no soportado."
 
-#: ../src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Intercambio: Tú"
+#: src/net/ea/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Error al añadir objeto. El otro jugador lleva mucho peso."
 
-#: ../src/net/tmwa/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Intercambio: Tú y %s"
+#: src/net/ea/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Error al anadir objeto. El otro jugador no tiene más espacio."
 
-#: ../src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Intercambio imposible. El personaje no existe."
+#: src/net/ea/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Fallo al anadir objeto por una razón desconocida."
 
-#: ../src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Intercambio es imposible. El otro personaje está muy alejado."
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+msgid "Trade canceled."
+msgstr "Intercambio Cancelado."
 
-#: ../src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Intercambiando con %s"
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+msgid "Trade completed."
+msgstr "Intercambio Realizado."
 
-#: ../src/gui/setup_video.cpp:477
-msgid "Transparency disabled"
-msgstr "Transparencia desabilitada"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr "Pulsa OK para reaparecer."
 
-#: ../src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
-msgstr "Transparencia habilitada."
+#: src/net/manaserv/beinghandler.cpp:325
+msgid "You Died"
+msgstr "Has muerto"
 
-#: ../src/localplayer.cpp:1251
-#, fuzzy
-msgid "Tried to pick up nonexistent item."
-msgstr "Imposible coger el objeto."
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr "No estás conectado."
 
-#: ../src/commandhandler.cpp:335
-msgid "Type /help for a list of commands."
-msgstr "Escribe /help para una lista de comandos."
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr "Sin espacios"
 
-#: ../src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
-msgstr "Escribe el nuevo email dos veces:"
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr "Nombre no válido."
 
-#: ../src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
-msgstr "Escribe la nueva contraseña 2 veces:"
+#: src/net/manaserv/charhandler.cpp:137
+msgid "Character's name already exists."
+msgstr "Nombre del jugador ya existe."
 
-#: ../src/gui/setup_colors.cpp:71
-msgid "Type:"
-msgstr "Tipo:"
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr "Estilo de pelo no válido."
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Imposible comprar."
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr "Color del pelo no válido."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
-msgid "Unable to equip."
-msgstr "Imposible equipar."
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr "Género no válido."
 
-#: ../src/net/tmwa/network.cpp:345
-msgid "Unable to resolve host \""
-msgstr "No es posible determinar el host \""
+#: src/net/manaserv/charhandler.cpp:149
+msgid "Character's stats are too high."
+msgstr "Atributos del personaje son muy altos."
 
-#: ../src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Imposible vender."
+#: src/net/manaserv/charhandler.cpp:152
+msgid "Character's stats are too low."
+msgstr "Atributos del personaje son muy bajos."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:418
-msgid "Unable to unequip."
-msgstr "Imposible quitárselo."
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr "Un stat es 0."
 
-#: ../src/gui/setup_keyboard.cpp:90
-msgid "Unassign"
-msgstr "Retirar"
+#: src/net/manaserv/charhandler.cpp:187
+msgid "Player deleted."
+msgstr "Personaje eliminado."
 
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
-msgid "Unequip"
-msgstr "Quitárselo"
+#: src/net/manaserv/charhandler.cpp:199
+msgid "Selection out of range."
+msgstr "Seleccion fuera de rango."
 
-#: ../src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
-msgstr "Quitárselo antes"
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
+msgstr "Error desconocido (%d)."
 
-#: ../src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "Intercambio no soportado."
+#: src/net/manaserv/charhandler.cpp:242
+msgid "No gameservers are available."
+msgstr "No hay servidores disponibles."
+
+#: src/net/manaserv/charhandler.cpp:268
+msgid "Willpower:"
+msgstr "Fuerza de voluntad:"
 
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
-msgid "Unignore %s"
-msgstr "Dejar de Ignorar %s"
+msgid "Topic: %s"
+msgstr "Tópico: %s"
 
-#: ../src/net/net.cpp:145
-#, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Tipo de objeto desconocido"
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr "Jugadores en este canal:"
 
-#: ../src/net/manaserv/chathandler.cpp:327
-msgid "Unknown channel event."
-msgstr "Evento de canal desconocido."
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr "Error al entrar al canal."
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
-msgid "Unknown char-server failure."
-msgstr "Error desconocido del char-server."
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr "Lista de canales."
 
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
-msgid "Unknown command."
-msgstr "Comando desconocido."
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr "Fin de la lista de canales."
 
-#: ../src/net/tmwa/generalhandler.cpp:148
-msgid "Unknown connection error."
-msgstr "Error de conexión desconocido."
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr "%s entró al canal."
 
-#: ../src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/chathandler.cpp:296
 #, c-format
-msgid "Unknown error (%d)."
-msgstr "Error desconocido (%d)."
+msgid "%s left the channel."
+msgstr "%s dejó el canal."
 
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
-msgid "Unknown error."
-msgstr "Error desconocido."
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr "%s colocó en el modo %s al usuario %s."
 
-#: ../src/net/tmwa/guildhandler.cpp:315
-msgid "Unknown guild invite response."
-msgstr "Invitación desconocida a una guild."
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr "%s expulsó a %s."
 
-#: ../src/net/tmwa/partyhandler.cpp:133
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr "Evento de canal desconocido."
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
-msgid "Unknown invite response for %s."
-msgstr "Invitacion desconocida para %s."
+msgid "Willpower %+d"
+msgstr "Fuerza de voluntad %+d"
 
-#: ../src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Objeto desconocido"
+#: src/net/manaserv/generalhandler.cpp:171
+msgid "Willpower"
+msgstr "Fuerza de voluntad"
 
-#: ../src/localplayer.cpp:1258
-#, fuzzy
-msgid "Unknown problem picking up item."
-msgstr "Imposible coger el objeto."
+#: src/net/manaserv/guildhandler.cpp:81
+msgid "Guild created."
+msgstr "Clan creado."
 
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Cancelar Registro"
+#: src/net/manaserv/guildhandler.cpp:86
+msgid "Error creating guild."
+msgstr "Error al crear el clan."
 
-#: ../src/client.cpp:926
-msgid "Unregister Successful"
-msgstr "Registro cancelado"
+#: src/net/manaserv/guildhandler.cpp:96
+msgid "Invite sent."
+msgstr "Invitación enviada."
 
-#: ../src/net/tmwa/loginhandler.cpp:156
-msgid "Unregistered ID."
-msgstr "ID no registrada."
+#: src/net/manaserv/guildhandler.cpp:203
+msgid "Member was promoted successfully."
+msgstr "Estado del miembro fue cambiado satisfactoriamente."
 
-#: ../src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Encima"
+#: src/net/manaserv/guildhandler.cpp:208
+msgid "Failed to promote member."
+msgstr "Error al cambiar estado del miembro."
 
-#: ../src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Actualizando..."
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr "Error de Token-mágico ."
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
-msgid "Use"
-msgstr "Usar"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr "El personaje ya está conectado."
 
-#: ../src/net/tmwa/guildhandler.cpp:305
-msgid "User is now part of your guild."
-msgstr "El usuario es ahora de tu clan."
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
+msgstr "Servidor lleno."
 
-#: ../src/net/tmwa/guildhandler.cpp:300
-msgid "User rejected guild invite."
-msgstr "El jugador cancel la invitacion a tu guild."
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr "Nueva contraseña incorrecta."
 
-#: ../src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr "Usuario ya existe."
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Cuenta no conectada. Por favor conéctate primero."
 
-#: ../src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Vídeo"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr "Nuevo e-mail incorrecto."
 
-#: ../src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Nombres Visibles"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr "E-mail antiguo incorrecto."
 
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Vitalidad"
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr "El nuevo e-mail ya existe."
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr "Vitalidad %+d"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+"El registro no está soportado. Por favor contacta un administrador del "
+"server."
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Vitalidad:"
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr "La version del cliente es demasiado antigua."
 
-#: ../src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "Esperando al servidor"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr "Nombre de usuario o contraseña incorrectos."
 
-#: ../src/gui/serverdialog.cpp:448
-msgid "Waiting for server..."
-msgstr "Esperando al servidor..."
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr "Intento de conexión muy pronto tras intento previo."
 
-#: ../src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "Fallo al teletransportar..."
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr "E-mail, nombre de usuario o contraseña incorrectos."
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate."
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr "Usuario ya existe."
 
-#: ../src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
-msgstr "Ponerse el conjunto"
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr "El e-mail ya existe."
 
-#: ../src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Peso:"
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr "Tardaste mucho con el captcha o tu respuesta fue incorrecta."
 
-#: ../src/gui/itempopup.cpp:126
-#, c-format
-msgid "Weight: %s"
-msgstr "Peso: %s"
+#: src/net/manaserv/partyhandler.cpp:88
+msgid "Joined party."
+msgstr "Entraste al grupo."
 
-#: ../src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "Cuando se ignora a alguien:"
+#: src/net/manaserv/partyhandler.cpp:106
+#, c-format
+msgid "%s joined the party."
+msgstr "%s ha entrado a formar parte del grupo."
 
-#: ../src/gui/popupmenu.cpp:91
+#: src/net/manaserv/partyhandler.cpp:123
 #, c-format
-msgid "Whisper %s"
-msgstr "Mensaje Privado %s"
+msgid "%s rejected your invite."
+msgstr "%s canceló tu invitación."
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Imposible enviar mensaje, estás ignorado por el otro jugador."
+#: src/net/manaserv/tradehandler.cpp:96
+msgid "Accepting incoming trade requests."
+msgstr "Aceptar propuestas de intercambio entrantes."
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "Imposible enviar mensaje, usuario desconectado."
+#: src/net/manaserv/tradehandler.cpp:98
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorar las propuestas de intercambio entrantes."
 
-#: ../src/gui/chat.cpp:452
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
-msgid "Whispering to %s: %s"
-msgstr "Enviando mensaje privado para %s: %s"
+msgid "Trading with %s"
+msgstr "Intercambiando con %s"
 
-#: ../src/gui/socialwindow.cpp:158
-#, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr "A quién te gustaría invitar al clan %s?"
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr "Ignorar completamente"
 
-#: ../src/gui/socialwindow.cpp:237
-#, c-format
-msgid "Who would you like to invite to party %s?"
-msgstr "A quién te gustaría invitar al grupo %s?"
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr "Imprimir '...'"
 
-#: ../src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr "Fuerza de voluntad"
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr "Parpadear nombre"
 
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "Fuerza de voluntad %+d"
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr "Burbuja '...' flotante"
 
-#: ../src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr "Error de Token-mágico ."
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr "Burbuja Flotante"
 
-#: ../src/net/tmwa/loginhandler.cpp:159
-msgid "Wrong password."
-msgstr "Contrasena incorrecta."
+#: src/resources/itemdb.cpp:52
+#, c-format
+msgid "Attack %+d"
+msgstr "Ataque %+d"
 
-#: ../src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr "Nombre de usuario o contraseña incorrectos."
+#: src/resources/itemdb.cpp:53
+#, c-format
+msgid "Defense %+d"
+msgstr "Defensa %+d"
 
-#: ../src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr "E-mail, nombre de usuario o contraseña incorrectos."
+#: src/resources/itemdb.cpp:54
+#, c-format
+msgid "HP %+d"
+msgstr "PV %+d"
 
-#: ../src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Sí"
+#: src/resources/itemdb.cpp:55
+#, c-format
+msgid "MP %+d"
+msgstr "PM %+d"
 
-#: ../src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr "Has muerto"
+#: src/resources/itemdb.cpp:114
+msgid "Unknown item"
+msgstr "Objeto desconocido"
 
-#: ../src/net/tmwa/playerhandler.cpp:139
-msgid "You are an ex-player."
-msgstr "Eres un ex-jugador."
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:69
+msgid "unnamed"
+msgstr "Sin Nombre"
 
-#: ../src/net/tmwa/playerhandler.cpp:257
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
+#: src/gui/setup_video.cpp:254
+#, fuzzy
+msgid "Show damage"
+msgstr "mostrar nombre"
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Estás muerto"
+#~ msgid "Changing game servers"
+#~ msgstr "Cambiando el servidor del juego"
 
-#: ../src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Tu ya no existes más."
+#~ msgid "/away > Tell the other whispering players you're away from keyboard."
+#~ msgstr ""
+#~ "/away > Les dice a los otros que estas fuera del PC mensaje privado ."
 
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Ya no estás tan vivo..."
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Comando: /away <motivo>"
 
-#: ../src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
-msgstr "Sólo puedes invitar cuando estés en un grupo!"
+#~ msgid "This command tells you're away from keyboard with the given reason."
+#~ msgstr "Este comando muestra que no estas en el PC por una razon dada."
 
-#: ../src/net/tmwa/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "No puedes hacer esto ahora mismo!"
+#~ msgid "Command: /away"
+#~ msgstr "Comando: /away"
 
-#: ../src/net/tmwa/specialhandler.cpp:189
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "No puedes usar estas habilidades con estas armas!"
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Este comando limpia el status y los mensajes \"away\"."
 
-#: ../src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "No tienes dinero suficiente."
+#~ msgid "Show IP: On"
+#~ msgstr "Mostrar IP: Activado"
 
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
-#, c-format
-msgid "You get %s"
-msgstr "Tú recibes %s"
+#~ msgid "Show IP: Off"
+#~ msgstr "Mostrar IP: Cancelado"
 
-#: ../src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "Tú das:"
+#~ msgid "Registration disabled"
+#~ msgstr "Registro desabilitado."
 
-#: ../src/gui/socialwindow.cpp:592
-#, c-format
-msgid "You have been invited to join the %s party."
-msgstr "Has sido invitado para unirte al grupo %s."
+#~ msgid "You need to use the website to register an account for this server."
+#~ msgstr "Necesitas registrarte desde la web para difrutar del juego."
 
-#: ../src/gui/socialwindow.cpp:588
-msgid "You have been invited you to join a party."
-msgstr "Fuiste invitado a un grupo."
+#~ msgid "Need"
+#~ msgstr "Necesitas"
 
-#: ../src/net/tmwa/loginhandler.cpp:168
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
-"GM."
+#~ msgid "Clear log"
+#~ msgstr "Limpiar log"
 
-#: ../src/net/tmwa/loginhandler.cpp:172
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
-msgstr ""
-"Has sido baneado temporalmente del juego %s.\n"
-"Por favor contacta un GM de nuestro equipo via el foro."
+#~ msgid "Error retreiving server list!"
+#~ msgstr "Error al recuperar la lista de servers!"
 
-#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Parece que dejaste de existir."
+#~ msgid "requires a newer version"
+#~ msgstr "requiere una version mas nueva"
 
-#: ../src/net/tmwa/partyhandler.cpp:241
-msgid "You have left the party."
-msgstr "Has dejado el grupo."
+#~ msgid "requires v%s"
+#~ msgstr "requiere v%s"
 
-#: ../src/net/tmwa/specialhandler.cpp:180
-msgid "You have no memos!"
-msgstr "No tienes ninguna nota armenzada!"
+#~ msgid "Log NPC dialogue"
+#~ msgstr "Log dealogos con un NPC"
 
-#: ../src/net/tmwa/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Usted no tiene suficiente nivel!"
+#~ msgid "Disable transparency (Low CPU mode)"
+#~ msgstr "Desabilitar transparencia (CPU Modo)"
 
-#: ../src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr "Necesitas reiniciar el client si quieres descargar la musica"
+#~ msgid ""
+#~ "Applying change to OpenGL requires restart. In case OpenGL messes up your "
+#~ "game graphics, restart the game with the command line option \"--no-opengl"
+#~ "\"."
+#~ msgstr ""
+#~ "Cambiar a OpenGL necesita reiniciar el cliente. En caso de OpenGL atrape "
+#~ "tus graficos, abra el juego atraves de linea de comando con la seguinte "
+#~ "opcion: \"--no-opengl\"."
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
-msgstr "Debes reiniciar el cliente para aplicar los cambios."
+#~ msgid "Deactivating OpenGL"
+#~ msgstr "Desativando OpenGL"
 
-#: ../src/net/tmwa/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "Necesitas otra Gema Azul!"
+#~ msgid "Transparency disabled"
+#~ msgstr "Transparencia desabilitada"
 
-#: ../src/net/tmwa/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "Necesitas otra Gema Roja!"
+#~ msgid "You must restart to apply changes."
+#~ msgstr "Debes reiniciar el cliente para aplicar los cambios."
 
-#: ../src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
-msgstr "Necesitas registrarte desde la web para difrutar del juego."
+#~ msgid "Transparency enabled"
+#~ msgstr "Transparencia habilitada."
 
-#: ../src/localplayer.cpp:1276
-#, 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@@]."
+#~ msgid "Creating guild failed, please choose a shorter name."
+#~ msgstr "Fallo al crear Guild escoja un nombre mas corto."
 
-#: ../src/net/tmwa/playerhandler.cpp:344
-#, c-format
-msgid "You picked up %s."
-msgstr "Has cogido %s."
+#~ msgid "Creating party failed, please choose a shorter name."
+#~ msgstr "Fallo al crear un Grupo escoja un nombre mas corto."
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Parece que te asustaste , revive en otro cuerpo y sigue tu aventura ."
+#~ msgid "Being"
+#~ msgstr "Personaje"
 
-#: ../src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr "Tardaste mucho con el captcha o tu respuesta fue incorrecta."
+#~ msgid "Other Players' Names"
+#~ msgstr "Nombres de otros jugadores"
 
-#: ../src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "Eres un cadáver."
+#~ msgid "Own Name"
+#~ msgstr "Propio Nombre"
 
-#: ../src/net/tmwa/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "Llevas muchas cosas para hacer esto!"
+#~ msgid "GM Names"
+#~ msgstr "Nombres De Los GMs"
 
-#: ../src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "Tu no estás muerto. Sólo estás descansando."
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
 
-#: ../src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
-msgstr "Estás fuera de tus botas."
+#~ msgid "Monsters"
+#~ msgstr "Monstruos"
 
-#: ../src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr "Estas avanzando... hacia el barranco."
+#~ msgid "Party Members"
+#~ msgstr "Miembros del grupo"
 
-#: ../src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "Has expirado e ido a ver al tu creador."
+#~ msgid "Guild Members"
+#~ msgstr "Miembros del guild"
 
-#: ../src/net/tmwa/playerhandler.cpp:136
-msgid "You've kicked the bucket."
-msgstr "Te han echado a patadas."
+#~ msgid "Particle Effects"
+#~ msgstr "Efectos Particulares"
 
-#: ../src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr ""
-"Has dejado tu cuerpo mortal, bajado las cortinas y unido al sangriento coro "
-"de los invisibles."
+#~ msgid "Pickup Notification"
+#~ msgstr "Aviso al cojer un objeto"
 
-#: ../src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
-msgstr "Tu clan está lleno."
+#~ msgid "Exp Notification"
+#~ msgstr "Aviso de experiencia"
 
-#: ../src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "Tus procesos metabólicos son ya historia."
+#~ msgid "Other Player Hits Monster"
+#~ msgstr "Cuando atacan a otros montruos"
 
-#: ../src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Su nombre debe de tener como mínimo 4 caracteres."
+#~ msgid "Monster Hits Player"
+#~ msgstr "Cuando un monstruo te ataca"
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Parece que tu plan de romper las armas de tus enemigos con tu garganta falló!"
+#~ msgid "Critical Hit"
+#~ msgstr "Golpe Critico"
 
-#: ../src/gui/setup_video.cpp:233
-msgid "as particle"
-msgstr "como partícula"
+#~ msgid "Local Player Hits Monster"
+#~ msgstr "Cuando le atacas al monstruo"
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "alto"
+#~ msgid "Local Player Critical Hit"
+#~ msgstr "Golpe Critico del jugador"
 
-#: ../src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "en chat"
+#~ msgid "Local Player Miss"
+#~ msgstr "Cuando fallas un ataque"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "bajo"
+#~ msgid "Misses"
+#~ msgstr "Muchos fallos al atacar"
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr "mana  [opciones] [archivo-mana]"
+#~ msgid "Away"
+#~ msgstr "Fuera del Teclado"
 
-#: ../src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "máximo"
+#~ msgid "Account banned."
+#~ msgstr "Cuenta Baneada."
 
-#: ../src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "medio"
+#~ msgid "Account banned"
+#~ msgstr "Cuenta Baneada"
 
-#: ../src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "apagado"
+#~ msgid ""
+#~ "Access denied. Most likely, there are too many players on this server."
+#~ msgstr "Acesso denegado.Probablemente es que alla muchos jugadores."
 
-#: ../src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr "requiere una version mas nueva"
+#~ msgid "Unknown char-server failure."
+#~ msgstr "Error desconocido del char-server."
 
-#: ../src/gui/serverdialog.cpp:558
-#, c-format
-msgid "requires v%s"
-msgstr "requiere v%s"
+#~ msgid "Inviting failed, because you can't see a player called %s."
+#~ msgstr "Imposible invitar por que no puedes ver al jugador %s."
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
-msgid "unnamed"
-msgstr "Sin Nombre"
+#~ msgid "Text Shadow"
+#~ msgstr "Sombra de Texto"
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " No se puede crear, pero no existe! Saliendo."
+#~ msgid "Text Outline"
+#~ msgstr "Lados del texto"
 
-#~ msgid " cancelled"
-#~ msgstr " cancelado"
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Barra de progreso"
 
-#~ msgid " host: "
-#~ msgstr " host: "
+#~ msgid "Background"
+#~ msgstr "Fondo"
 
-#~ msgid " video mode: "
-#~ msgstr " modo de video: "
+#~ msgid "Highlight"
+#~ msgstr "Opacidad"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Reflexionar:"
+#~ msgid "Tab Highlight"
+#~ msgstr "Opacidad de una tabla"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Alias de crear"
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Objeto muy caro"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 de barra de HP"
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Objeto esta equipado"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 de barra de HP"
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Armas para 2 manos"
+#~ msgid "Player"
+#~ msgstr "Jugador"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 de barra de HP"
+#~ msgid "Whisper"
+#~ msgstr "Sussurrar"
 
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Expulsar jugador@@"
+#~ msgid "Is"
+#~ msgstr "Es"
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Atacar %s@@"
+#~ msgid "Server"
+#~ msgstr "Servidor"
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Cancelar@@"
+#~ msgid "Logger"
+#~ msgstr "Historial"
 
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|Desconsiderar %s@@"
+#~ msgid "Hyperlink"
+#~ msgstr "Link"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Tirar@@"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Tipo de objeto desconocido"
 
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|Ignorar %s@@"
+#~ msgid "Generics"
+#~ msgstr "Genericos"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pegar|Coger %s@@"
+#~ msgid "Hats"
+#~ msgstr "Gorros"
 
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|Cojer %s@@"
+#~ msgid "Usables"
+#~ msgstr "Usables"
 
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|Retirar@@"
+#~ msgid "Shirts"
+#~ msgstr "Camisas"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Dividir@@"
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Armas para 1 mano"
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Almacenar@@"
+#~ msgid "Pants"
+#~ msgstr "Pantalones"
 
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Intercambiar con %s@@"
+#~ msgid "Shoes"
+#~ msgstr "Zapatos"
 
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Dejar de ignorar %s@@"
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Armas con las 2 manos"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Equipar@@"
+#~ msgid "Shields"
+#~ msgstr "Escudos"
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Desequipar@@"
+#~ msgid "Rings"
+#~ msgstr "Anillos"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Usar@@"
+#~ msgid "Necklaces"
+#~ msgstr "Collares"
 
-#~ msgid "Access denied."
-#~ msgstr "Acesso denegado."
+#~ msgid "Arms"
+#~ msgstr "Armas"
 
 #~ msgid "Ammo"
 #~ msgstr "Municion"
 
-#~ msgid "Arms"
-#~ msgstr "Armas"
+#~ msgid "HP Bar"
+#~ msgstr "Barra de HP"
 
-#~ msgid "Attack:"
-#~ msgstr "Ataque:"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 de barra de HP"
 
-#~ msgid "Axe"
-#~ msgstr "Hacha"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 de barra de HP"
 
-#~ msgid "Background"
-#~ msgstr "Fondo"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 de barra de HP"
 
-#~ msgid "Bow"
-#~ msgstr "Arco"
+#~ msgid "no"
+#~ msgstr "No"
 
 #~ msgid "Buddy"
 #~ msgstr "Amigo"
@@ -3748,267 +3680,245 @@ msgstr "Sin Nombre"
 #~ msgid "Buddy List"
 #~ msgstr "Lista de amigos"
 
-#~ msgid "Buddys"
-#~ msgstr "Amigos"
+#~ msgid "Description: %s"
+#~ msgstr "Descripcion: %s"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Lanzar echizo de prueba   1"
+#~ msgid "Effect: %s"
+#~ msgstr "Efecto: %s"
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Lanzar echizo de prueba   2"
+#~ msgid "Previous"
+#~ msgstr "Anterior"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Lanzar echizo de prueba   3"
+#~ msgid "New"
+#~ msgstr "Nuevo"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Comando: /new <nombre-del-grupo>"
+#~ msgid "Job Level: %d"
+#~ msgstr "Nivel de trabajo: %d"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Conectando al servidor de cuentas..."
+#~ msgid "Present: "
+#~ msgstr "Presente: "
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Conectando al servidor de personajes..."
+#~ msgid "Quit Guild"
+#~ msgstr "Salir del Guild"
 
-#~ msgid "Cost"
-#~ msgstr "Precio"
+#~ msgid "Ok"
+#~ msgstr "Ok"
 
-#~ msgid "Couldn't set "
-#~ msgstr "No se puede configurar "
+#~ msgid "Recent:"
+#~ msgstr "Reciente:"
 
-#~ msgid "Craft"
-#~ msgstr "Embarcaciones"
+#~ msgid "Magic"
+#~ msgstr "Magia"
 
-#~ msgid "Crafts"
-#~ msgstr "Artesanos"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Lanzar echizo de prueba   1"
 
-#~ msgid "Description: %s"
-#~ msgstr "Descripcion: %s"
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Lanzar echizo de prueba   2"
 
-#~ msgid "Effect: %s"
-#~ msgstr "Efecto: %s"
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Lanzar echizo de prueba   3"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Fallo al cambiar a "
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Armas para 2 manos"
 
-#~ msgid "Follow %s"
-#~ msgstr "Seguir %s"
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Intercambiar con %s@@"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Atacar %s@@"
 
-#~ msgid "Generics"
-#~ msgstr "Genericos"
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Desconsiderar %s@@"
 
-#~ msgid "Guilds"
-#~ msgstr "Guilds"
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignorar %s@@"
 
-#~ msgid "HP Bar"
-#~ msgstr "Barra de HP"
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Dejar de ignorar %s@@"
 
-#~ msgid "Hats"
-#~ msgstr "Gorros"
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Expulsar jugador@@"
 
-#~ msgid "Highlight"
-#~ msgstr "Opacidad"
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancelar@@"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Link"
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Cojer %s@@"
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Invitar así no esta soportado por el momento."
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Desequipar@@"
 
-#~ msgid "Is"
-#~ msgstr "Es"
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Equipar@@"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Objeto esta equipado"
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Usar@@"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Objeto muy caro"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Tirar@@"
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Nivel de trabajo: %d"
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Dividir@@"
 
-#~ msgid "Knife"
-#~ msgstr "Navaja"
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Almacenar@@"
 
-#~ msgid "Logger"
-#~ msgstr "Historial"
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Retirar@@"
 
-#~ msgid "Mace"
-#~ msgstr "Mazo"
+#~ msgid "Select Server"
+#~ msgstr "Selecionar Servidor"
 
-#~ msgid "Magic"
-#~ msgstr "Magia"
+#~ msgid "Failed to switch to "
+#~ msgstr "Fallo al cambiar a "
 
-#~ msgid "Max level"
-#~ msgstr "Nivel maximo"
+#~ msgid "windowed"
+#~ msgstr "en ventana"
+
+#~ msgid "fullscreen"
+#~ msgstr "pantalla completa"
 
 #~ msgid "Mystery Skill"
 #~ msgstr "Habilidade Misteriosa"
 
-#~ msgid "Necklaces"
-#~ msgstr "Collares"
-
-#~ msgid "New"
-#~ msgstr "Nuevo"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Armas para 1 mano"
-
-#~ msgid "Pants"
-#~ msgstr "Pantalones"
-
-#~ msgid "Party Window"
-#~ msgstr "Ventana de Grupo"
-
-#~ msgid "Player"
-#~ msgstr "Jugador"
+#~ msgid "Weapons"
+#~ msgstr "Armas"
 
-#~ msgid "Polearm"
-#~ msgstr "Lanza"
+#~ msgid "Crafts"
+#~ msgstr "Artesanos"
 
-#~ msgid "Present: "
-#~ msgstr "Presente: "
+#~ msgid "Stats"
+#~ msgstr "Status"
 
-#~ msgid "Previous"
-#~ msgstr "Anterior"
+#~ msgid "Total"
+#~ msgstr "Total"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Barra de progreso"
+#~ msgid "Cost"
+#~ msgstr "Precio"
 
-#~ msgid "Quit Guild"
-#~ msgstr "Salir del Guild"
+#~ msgid "Attack:"
+#~ msgstr "Ataque:"
 
-#~ msgid "Recent:"
-#~ msgstr "Reciente:"
+#~ msgid "% Reflex:"
+#~ msgstr "% Reflexionar:"
 
 #~ msgid "Remaining Status Points: %d"
 #~ msgstr "Puntos de Status restantes: %d"
 
-#~ msgid "Rings"
-#~ msgstr "Anillos"
-
-#~ msgid "Scroll laziness"
-#~ msgstr "Desplazar Laziness"
+#~ msgid "Max level"
+#~ msgstr "Nivel maximo"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Desplazar Radius"
+#~ msgid "curl error "
+#~ msgstr "Error de curl "
 
-#~ msgid "Select Server"
-#~ msgstr "Selecionar Servidor"
+#~ msgid " host: "
+#~ msgstr " host: "
 
-#~ msgid "Server"
-#~ msgstr "Servidor"
+#~ msgid "Guilds"
+#~ msgstr "Guilds"
 
-#~ msgid "Shields"
-#~ msgstr "Escudos"
+#~ msgid "Buddys"
+#~ msgstr "Amigos"
 
-#~ msgid "Shirts"
-#~ msgstr "Camisas"
+#~ msgid "Party Window"
+#~ msgstr "Ventana de Grupo"
 
-#~ msgid "Shoes"
-#~ msgstr "Zapatos"
+#~ msgid "Unarmed"
+#~ msgstr "Desarmado"
 
-#~ msgid "Shooting"
-#~ msgstr "Tiro"
+#~ msgid "Knife"
+#~ msgstr "Navaja"
 
-#~ msgid "Show monster damage"
-#~ msgstr "Mostrar daño recibido"
+#~ msgid "Sword"
+#~ msgstr "Espada"
 
-#~ msgid "Slots: "
-#~ msgstr "ranuras: "
+#~ msgid "Polearm"
+#~ msgstr "Lanza"
 
 #~ msgid "Staff"
 #~ msgstr "Staff"
 
-#~ msgid "Stats"
-#~ msgstr "Status"
-
-#~ msgid "Sword"
-#~ msgstr "Espada"
+#~ msgid "Whip"
+#~ msgstr "Whip"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Opacidad de una tabla"
+#~ msgid "Bow"
+#~ msgstr "Arco"
 
-#~ msgid "Text Outline"
-#~ msgstr "Lados del texto"
+#~ msgid "Shooting"
+#~ msgstr "Tiro"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Sombra de Texto"
+#~ msgid "Mace"
+#~ msgstr "Mazo"
 
-#~ msgid "The Mana World %s"
-#~ msgstr "The Mana World %s"
+#~ msgid "Axe"
+#~ msgstr "Hacha"
 
 #~ msgid "Thrown"
 #~ msgstr "Arrojado"
 
-#~ msgid "Total"
-#~ msgstr "Total"
-
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Armas con las 2 manos"
-
-#~ msgid "Unable to load selection.png"
-#~ msgstr "no se pudo cargar selection.png"
-
-#~ msgid "Unarmed"
-#~ msgstr "Desarmado"
+#~ msgid "Craft"
+#~ msgstr "Embarcaciones"
 
 #~ msgid "Unknown Skill"
 #~ msgstr "Habilidade desconocida"
 
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Error desconocido al seleccionar este jugador."
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " No se puede crear, pero no existe! Saliendo."
 
-#~ msgid "Unnamed"
-#~ msgstr "Sin nombre"
+#~ msgid "Couldn't set "
+#~ msgstr "No se puede configurar "
 
-#~ msgid "Usables"
-#~ msgstr "Usables"
+#~ msgid " video mode: "
+#~ msgstr " modo de video: "
 
-#~ msgid "Weapons"
-#~ msgstr "Armas"
+#~ msgid "mana"
+#~ msgstr "Mana"
 
-#~ msgid "Whip"
-#~ msgstr "Whip"
+#~ msgid "Connecting to character server..."
+#~ msgstr "Conectando al servidor de personajes..."
 
-#~ msgid "Whisper"
-#~ msgstr "Sussurrar"
+#~ msgid "Connecting to account server..."
+#~ msgstr "Conectando al servidor de cuentas..."
+
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Alias de crear"
 
-#~ msgid "Willpower:"
-#~ msgstr "Fuerza de voluntad:"
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Comando: /new <nombre-del-grupo>"
 
 #~ msgid "a"
 #~ msgstr "una(o)"
 
-#~ msgid "curl error "
-#~ msgstr "Error de curl "
+#~ msgid "Unnamed"
+#~ msgstr "Sin nombre"
 
-#~ msgid "fullscreen"
-#~ msgstr "pantalla completa"
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@pegar|Coger %s@@"
 
-#~ msgid "items.xml"
-#~ msgstr "items.xml"
+#~ msgid "Scroll radius"
+#~ msgstr "Desplazar Radius"
 
-#~ msgid "mana"
-#~ msgstr "Mana"
+#~ msgid "Scroll laziness"
+#~ msgstr "Desplazar Laziness"
 
-#~ msgid "monsters.xml"
-#~ msgstr "monsters.xml"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "no se pudo cargar selection.png"
 
-#~ msgid "no"
-#~ msgstr "No"
+#~ msgid "Slots: "
+#~ msgstr "ranuras: "
 
 #~ msgid "skills.xml"
 #~ msgstr "skills.xml"
 
-#~ msgid "windowed"
-#~ msgstr "en ventana"
+#~ msgid " cancelled"
+#~ msgstr " cancelado"
+
+#~ msgid "monsters.xml"
+#~ msgstr "monsters.xml"
+
+#~ msgid "items.xml"
+#~ msgstr "items.xml"
+
+#~ msgid "The Mana World %s"
+#~ msgstr "The Mana World %s"
diff --git a/po/et.po b/po/et.po
index 9e9c60bb..319fbb2a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-01-26 08:47+0000\n"
 "Last-Translator: Kerdo <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -19,468 +19,448 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Viga"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:274
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -489,39 +469,39 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -535,34 +515,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -576,11 +556,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -653,14 +633,14 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -675,8 +655,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -731,8 +711,8 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -741,24 +721,24 @@ msgstr "Kustuta"
 msgid "Choose"
 msgstr "Sulge"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Vestlus"
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -824,8 +804,8 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
@@ -833,7 +813,7 @@ msgstr ""
 msgid "Help"
 msgstr "Abi"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Sulge"
 
@@ -845,80 +825,83 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -947,40 +930,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Järgmine"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -995,7 +978,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1081,7 +1064,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1153,56 +1136,56 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1239,50 +1222,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1366,27 +1349,31 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1442,486 +1429,458 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Ei"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Raha: %s"
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "Raha: %d"
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-msgid "Level"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1960,78 +1919,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2108,53 +1995,53 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2178,478 +2065,491 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2726,11 +2626,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2740,186 +2640,134 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2932,71 +2780,116 @@ msgstr ""
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Kustuta"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3041,27 +2934,27 @@ msgstr ""
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3137,15 +3030,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3153,15 +3046,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3169,15 +3062,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3233,7 +3126,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3241,242 +3134,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3492,55 +3380,50 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Raha: %d"
+
 #~ msgid "Previous"
 #~ msgstr "Eelmine"
 
diff --git a/po/fa.po b/po/fa.po
index 6e404730..f8d7f741 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-24 18:21+0000\n"
 "Last-Translator: kasra5004 <kasra5004@yahoo.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
@@ -19,474 +19,454 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "در حال اتصال..."
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "در حال اتصال..."
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "خطا"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "گذرواژه:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "ثبت نام نشده"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "چنین دستور وجود ندارد"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "رهنما"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "ص�حه ی راهنما را نشان می دهد"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "نام نقشه ی حاضر را نشان می دهد"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "تعداد ا�راد آنلاین را نشان می دهد"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "با این �رمان می توانید به سایرین چیزی در مورد خودتان بگویید"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "ص�حه را پاک می کند"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "می توانید با این �رمان پیغام خصوصی ب�رستید"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "با این دستور می توانید یک شاخه برای پیغام های خصوصی  کاربری دیگر ، درست کنید"
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "تمامی کانال های عمومی را نشان می دهد"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "با این دستور می توانید به یک کانال بپیوندید یا یکی درست کنید"
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "می توانید به وسیله ی آن از چت خود، یک کپی خروجی بگیرید"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "اعلام سراسری( تنها مسئولان بازی می توانند از آن است�اده کنند.)"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "برای اطلاعات بیشتر ،  <دستور مورد نظر> help/   را تایپ کنید"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:274
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -495,39 +475,39 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr "کلی"
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "خطای شبکه"
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -541,34 +521,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "خروج"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "حداکثر"
 
@@ -582,11 +562,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "انصرا�"
@@ -659,14 +639,14 @@ msgstr ""
 msgid "Name:"
 msgstr "نام"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -683,8 +663,8 @@ msgstr "رنگ مو"
 msgid "Hair style:"
 msgstr "مدل مو"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "بساز"
 
@@ -739,8 +719,8 @@ msgstr "ثبت نام نشده"
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "حذ�"
 
@@ -748,24 +728,24 @@ msgstr "حذ�"
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "چت"
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -831,8 +811,8 @@ msgstr ""
 msgid "Equipment"
 msgstr "تجهیزات"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
@@ -840,7 +820,7 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
@@ -852,80 +832,83 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "تایید"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -954,40 +937,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "بعدی"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1002,7 +985,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1088,7 +1071,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1160,57 +1143,57 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "در حال اتصال..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1247,50 +1230,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1374,27 +1357,31 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1450,486 +1437,459 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "آیا مطمئن هستید که می‌خواهید خارج شوید؟"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "آیا مطمئن هستید که می‌خواهید خارج شوید؟"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "بساز"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-msgid "Level"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1968,78 +1928,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2116,53 +2004,53 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2186,389 +2074,402 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "ص�حه ی راهنما را نشان می دهد"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2576,91 +2477,91 @@ msgstr ""
 msgid "Unknown error."
 msgstr "چنین دستور وجود ندارد"
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "چنین دستور وجود ندارد"
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "چنین دستور وجود ندارد"
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2737,11 +2638,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2751,187 +2652,135 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "چنین دستور وجود ندارد"
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2945,71 +2794,116 @@ msgstr "نام"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "حذ�"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3055,27 +2949,27 @@ msgstr ""
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3151,15 +3045,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3167,15 +3061,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3183,15 +3077,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3249,7 +3143,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3257,242 +3151,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
-#, fuzzy, c-format
-msgid "Invited user %s to party."
-msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
-
-#: src/net/tmwa/partyhandler.cpp:340
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3508,52 +3397,43 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 0a27d640..7cb15b8e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-25 15:42+0000\n"
 "Last-Translator: gemis <vienamo@mbnet.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -19,479 +19,458 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Yhdistetään kartta palvelimelle"
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Kirjaudu sisään"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Valitse hahmo"
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Yhdistetään kartta palvelimelle"
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Palvelin:"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Salasana:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Muuta"
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Poista palvelimelta"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Tuntematon komento."
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "--Apua--"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Näyttää tämän apu tekstin"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Näytä kartan nimi"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Näytä paikalla olevien pelaajien määrä"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Kerro jotain itsestäsi"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Tyhjennä ikkuna"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Lähetä yksityis viesti käyttäjälle"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Tekee välilehden toisen käyttäjän yksityisviestejä varten."
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Näytä kaikki julkiset kanavat"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Liity tai luo kanava"
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Aloita keskustelun nauhoitus ulkoiseen tiedostoon"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Tämä komento näyttää listan kaikista komennoista."
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Jos kanavaa <cannel> ei ole, se luodaan."
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Tämä komento näyttää listan kaikista kanavista"
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Tämä komento lähettää tekstin <message> käyttäjälle <nick>."
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Tällä komennolla poistut kanvalta."
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Tällä komennolla poistut kanvalta."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "Tämä komento aloittaa keskustelun nauhoituksen tiedostoon <filename>."
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Tämä komento näyttää nykyisen kartan nimen"
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Kirjoita /help jotta näkisit listan komennoista."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -500,42 +479,42 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu ~/"
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi, ohjelma sulkeutuu nyt"
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksy kauppa pyyntö"
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Karttaa ei voi ladata"
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ongelma ladatessa %s"
@@ -549,34 +528,34 @@ msgstr ""
 msgid "Buy"
 msgstr "Osta"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Sulje"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Max"
 
@@ -590,11 +569,11 @@ msgstr "Myy"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Peru"
@@ -669,14 +648,14 @@ msgstr "Luo hahmo"
 msgid "Name:"
 msgstr "Nimi:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -693,8 +672,8 @@ msgstr "Hiusten väri:"
 msgid "Hair style:"
 msgstr "Hiustyyli:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Luo"
 
@@ -750,8 +729,8 @@ msgstr "Poista palvelimelta"
 msgid "Change Email"
 msgstr "Vaihda sähköpostiosoite"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Poista"
 
@@ -760,24 +739,24 @@ msgstr "Poista"
 msgid "Choose"
 msgstr "Sulje"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -843,8 +822,8 @@ msgstr "Taustaäänet"
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
@@ -852,7 +831,7 @@ msgstr "Poista varuste käytöstä"
 msgid "Help"
 msgstr "Apua"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Sulje"
 
@@ -864,81 +843,84 @@ msgstr "Varusteluettelo"
 msgid "Storage"
 msgstr "Varasto"
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Ota käyttöön"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Käytä"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Pudota"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Jaa"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Paino:"
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr "Talleta"
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Pudota"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Kaikki"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Anna vaihdettavien tavaroiden määrä."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Paino: "
@@ -969,40 +951,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Kartta"
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Odotetaan palvelinta"
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Seuraava"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Lähetä"
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "Epäpelattava hahmo"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Nollaa"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1017,7 +999,7 @@ msgstr ""
 msgid "Send"
 msgstr "Lähetä"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1105,7 +1087,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1177,61 +1159,61 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Valitse palvelin"
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Portti:"
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Palvelin:"
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Yhdistetään..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Odotetaan palvelinta"
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1269,50 +1251,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Värit"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Sateenkaari"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1396,28 +1378,32 @@ msgstr "ohitettu"
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Salli kaupakäynti"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Näytä nimi"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Pelaajat"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1473,501 +1459,472 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Näytä nimet"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Hiukkas tehosteet"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Näytä nimi"
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Kuva"
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 #, fuzzy
 msgid "Show damage"
 msgstr "Näytä nimi"
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Hiukkas tehosteet"
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Ei"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Kokoruututilaan siirtyminen"
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan OpenGL -toimintatilaan"
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Näytön resoluutio vaihdettu"
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Hiukkas tehoste asetukset vaihdettu."
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Taidot"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Ylös"
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Taidot"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Taso: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Haluatko varmasti lopettaa?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Haluatko varmasti lopettaa?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Luo hahmo"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Kutsu käyttäjä"
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Suuri"
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "T"
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Valitse palvelin"
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Valitse palvelin"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "Rahatilanne: %d"
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Hahmon pistejako OK"
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Taso: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Ehdota vaihtokauppaa"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Varmistettu. Odotetaan..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Hyväksy kauppa"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Hyväksytty. Odotetaan..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Annat:"
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Annat:"
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Muuta"
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
@@ -2007,80 +1964,6 @@ msgstr "##1  yrität myöhemmin uudelleen"
 msgid "Completed"
 msgstr "Valmis"
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Muiden pelaajien nimet"
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Oma nimi"
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "T"
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPCt"
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Hirviöt"
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "T"
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Muiden pelaajien nimet"
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2159,54 +2042,54 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Globaali ilmoitus:"
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Tämä komento aloittaa keskustelun nauhoituksen tiedostoon <filename>."
@@ -2234,307 +2117,319 @@ msgstr "Muuta"
 msgid "Choose World"
 msgstr "Valitse palvelin"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Ylöspäin"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Alaspäin"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Vasemmalle"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Oikealle"
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Hirviöt"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Piilota ikkunat"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Istu"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Kuvankaappaus"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Inventaario Ikkuna"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Varuste ikkuna"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Asetus ikkuna"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Piilota ikkunat"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Varuste ikkuna"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Edellinen keskustelu välilehti"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Seuraava keskustelu välilehti"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Asetukset:"
 
-#: src/main.cpp:44
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:45
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/help > Näyttää tämän apu tekstin"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr "Sinä olet kuollut."
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr "Et ole enää elossa."
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr "Peli Loppu!"
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2542,7 +2437,7 @@ msgstr ""
 "Ei, lapset. Teidän hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan "
 "paikkaan."
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -2550,84 +2445,85 @@ msgstr ""
 "Suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi "
 "epäonnistui."
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
 msgid "You Died"
 msgstr "Annat:"
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 #, fuzzy
 msgid "Character's name already exists."
 msgstr "Hahmo poistettu"
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
 msgid "Character's stats are too high."
 msgstr "Hahmon pistejako OK"
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 #, fuzzy
 msgid "Character's stats are too low."
 msgstr "Hahmon pistejako OK"
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2635,93 +2531,93 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Tuntematon virhe"
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 #, fuzzy
 msgid "Player deleted."
 msgstr "Hahmo poistettu"
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Anna vaihdettavien tavaroiden määrä."
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Tuntematon virhe"
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "Tuntematon komento."
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2807,11 +2703,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2821,189 +2717,136 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Tahdonvoima:"
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s haluaa käydäkauppaa kanssasi, hyväksytkö pyynnön?"
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Ei mitään myytävää"
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Tuntematon virhe"
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Hahmo poistettu"
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui"
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Voima:"
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Ketteryys:"
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Elinvoima:"
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Älykkyys:"
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Näppäryys:"
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Pelaaja"
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Kanavia ei tueta!"
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -3017,78 +2860,123 @@ msgstr "Nimi"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Tunnistus epäonnistui"
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Palvelimia ei saatavilla"
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Joku muu yrittää käyttää tätä tunnusta"
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Tällä tunnuksella on jo kirjauduttu"
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Tuntematon yhteys ongelma"
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Puolustus %+d"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Hyökkäys %+d"
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Puolustus %+d"
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Tarkkuus:"
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3136,27 +3024,27 @@ msgstr "Tämä komento lähettää tekstin <message> käyttäjälle <nick>."
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3232,15 +3120,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3248,15 +3136,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3264,15 +3152,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Esineen käyttö epä-onnistui"
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3338,7 +3226,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr "Yhdistetään kartta palvelimelle"
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3346,242 +3234,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Syötä kolikko jatkaaksesi."
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Sinä et ole kuollut vielä. olet vain lepäämässä."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Sinä et ole enään."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Viesti"
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Painat yli puolet painostasi. Et voi saavuttaa terveyttä enää."
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Kauppa epäonnistui!"
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Istuminen epäonnistui!"
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Et voi tehdä sitä juuri nyt!"
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Näyttää siltä että tarvitset lisää rahaa."
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa."
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Tarvitset toisen punaisen helmen."
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Tarvitset toisen sinisen helmen."
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Myrkyllä ei ollut vaikutusta..."
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Kaupankäynti ei ole mahdollista. kauppa kumppani on liian kaukana."
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Kaupankäynti ei ole mahdollista. Hahmoa ei ole."
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Kauppa keskeytyi tuntemattomasta syystä."
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3597,53 +3480,44 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 #, fuzzy
 msgid "Completely ignore"
 msgstr "Valmis"
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr "Hyökkäys %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr "Puolustus %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr "Iskupisteet %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "Taikapisteet %+d"
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
@@ -3669,6 +3543,21 @@ msgstr ""
 #~ msgid "Hyperlink"
 #~ msgstr "Hyperlinkki"
 
+#~ msgid "Other Players' Names"
+#~ msgstr "Muiden pelaajien nimet"
+
+#~ msgid "Own Name"
+#~ msgstr "Oma nimi"
+
+#~ msgid "GM Names"
+#~ msgstr "T"
+
+#~ msgid "NPCs"
+#~ msgstr "NPCt"
+
+#~ msgid "Monsters"
+#~ msgstr "Hirviöt"
+
 #~ msgid "Unknown Item Type"
 #~ msgstr "Tuntematon esine tyyppi"
 
@@ -3697,6 +3586,14 @@ msgstr ""
 #~ msgstr "Panokset"
 
 #, fuzzy
+#~ msgid "Money"
+#~ msgstr "Rahatilanne: %d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Taso: %d"
+
+#, fuzzy
 #~ msgid "Access denied."
 #~ msgstr "Pääsy evätty"
 
@@ -3707,6 +3604,10 @@ msgstr ""
 #~ msgid "Willpower:"
 #~ msgstr "Tahdonvoima:"
 
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Tahdonvoima:"
+
 #~ msgid "no"
 #~ msgstr "ei"
 
diff --git a/po/fr.po b/po/fr.po
index b15b2d33..e298f710 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,434 +7,417 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
-"PO-Revision-Date: 2011-01-11 22:42+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"PO-Revision-Date: 2010-12-29 00:51+0100\n"
 "Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
 "Language-Team: French <Yohann Ferreira <yohann ferreira orange efer>>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 "#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Project-Id-Version: The Mana World 0.1.0\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"PO-Revision-Date: 2011-01-11 22:42+0100\n"
+"Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
+"Language-Team: French <Yohann Ferreira <yohann ferreira orange efer>>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: ../src/gui/npcdialog.cpp:183
-msgid ""
-"\n"
-"> Next\n"
-msgstr ""
-"\n"
-"> Suivant\n"
-
-#: ../src/main.cpp:60
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "     --no-opengl : Désactive l'OpenGL pour cette session"
-
-#: ../src/main.cpp:58
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
-
-#: ../src/main.cpp:52
-msgid "     --update-host    : Use this update host"
-msgstr ""
-"     --update-host : Utilise cette URL pour les fichiers de mises à jour"
-
-#: ../src/main.cpp:46
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
-
-#: ../src/main.cpp:53
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default : Choisir le serveur de personnages et le personnage par "
-"défaut"
+#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Configuration"
 
-#: ../src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-"  -L --localdata-dir : Répertoire à utiliser comme répertoire principal"
+#: src/client.cpp:643
+msgid "Connecting to server"
+msgstr "Connexion au serveur"
 
-#: ../src/main.cpp:48
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Se connecter avec ce mot de passe"
+#: src/client.cpp:670
+msgid "Logging in"
+msgstr "Connexion"
 
-#: ../src/main.cpp:47
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
+#: src/client.cpp:703
+msgid "Entering game world"
+msgstr "Connexion au monde de jeu"
 
-#: ../src/main.cpp:49
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Se connecter avec ce personnage"
+#: src/client.cpp:762
+msgid "Requesting characters"
+msgstr "Téléchargement des personnnages"
 
-#: ../src/main.cpp:56
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Répertoire des données du jeu à charger"
+#: src/client.cpp:791
+msgid "Connecting to the game server"
+msgstr "Connexion au serveur de jeu"
 
-#: ../src/main.cpp:45
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help : Montre cette rubrique d'aide"
+#: src/client.cpp:801
+msgid "Changing game servers"
+msgstr "Changement de serveur de jeu"
 
-#: ../src/main.cpp:51
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Port de connexion au serveur"
+#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
+#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Error"
+msgstr "Erreur"
 
-#: ../src/main.cpp:50
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
+#: src/client.cpp:846
+msgid "Requesting registration details"
+msgstr "Demande des paramètres d'enregistrement"
 
-#: ../src/main.cpp:55
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-"  -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
+#: src/client.cpp:873
+msgid "Password Change"
+msgstr "Changement de mot de passe"
 
-#: ../src/main.cpp:44
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Affiche la version"
+#: src/client.cpp:874
+msgid "Password changed successfully!"
+msgstr "Le mot de passe a été changé avec succès !"
 
-#: ../src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1 Il est fortement recommandé que"
+#: src/client.cpp:893
+msgid "Email Change"
+msgstr "Changer d'email"
 
-#: ../src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1 Le processus de mise à jour n'est pas achevé"
+#: src/client.cpp:894
+msgid "Email changed successfully!"
+msgstr "L'adresse email a été changé avec succès !"
 
-#: ../src/gui/updatewindow.cpp:421
-msgid "##1  you try again later."
-msgstr "##1 Essayez à nouveau plus tard"
+#: src/client.cpp:914
+msgid "Unregister Successful"
+msgstr "Désincription réussie"
 
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Précision"
+#: src/client.cpp:915
+msgid "Farewell, come back any time..."
+msgstr "Adieu, revenez dès que vous le souhaitez..."
 
-#: ../src/net/tmwa/generalhandler.cpp:230
+#: src/client.cpp:1090 src/client.cpp:1113
 #, c-format
-msgid "% Critical"
-msgstr "% Coup critique"
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr "%s n'existe pas et ne peut pas être créé ! Fin du programme."
 
-#: ../src/net/tmwa/generalhandler.cpp:229
+#: src/client.cpp:1232
 #, c-format
-msgid "% Evade"
-msgstr "% Esquive"
+msgid "Invalid update host: %s"
+msgstr "Hôte de mise à jour incorrect : %s"
 
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr "%d FPS"
+#: src/client.cpp:1266 src/client.cpp:1272
+msgid "Error creating updates directory!"
+msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: ../src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
-msgstr "%d FPS (OpenGL)"
+#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+msgid "Unknown command."
+msgstr "Commande inconnue."
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
-#, c-format
-msgid "%s doesn't exist and can't be created! Exiting."
-msgstr "%s n'existe pas et ne peut pas être créé ! Fin du programme."
+#: src/commandhandler.cpp:165
+msgid "-- Help --"
+msgstr "-- Aide --"
 
-#: ../src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s a rejoint le canal."
+#: src/commandhandler.cpp:166
+msgid "/help > Display this help"
+msgstr "/help > Montre l'aide"
 
-#: ../src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s vous a invité à rejoindre le groupe %s."
+#: src/commandhandler.cpp:168
+msgid "/where > Display map name"
+msgstr "/where > Affiche le nom de la carte"
 
-#: ../src/gui/socialwindow.cpp:561
-#, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s vous a invité à rejoindre la guilde %s."
+#: src/commandhandler.cpp:169
+msgid "/who > Display number of online users"
+msgstr "/who > Affiche le nombre d'utilisateurs en ligne"
 
-#: ../src/gui/socialwindow.cpp:600
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s vous a invité à rejoindre son groupe."
+#: src/commandhandler.cpp:170
+msgid "/me > Tell something about yourself"
+msgstr "/me > Dire quelque chose à votre propos"
 
-#: ../src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s a éjecté %s."
+#: src/commandhandler.cpp:172
+msgid "/clear > Clears this window"
+msgstr "/clear > Vide cette fenêtre"
 
-#: ../src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s a quitté le groupe."
+#: src/commandhandler.cpp:174
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Envoie un message privé à un utilisateur"
 
-#: ../src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s a activé le mode %s sur le joueur %s."
+#: src/commandhandler.cpp:175
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Alias de msg"
 
-#: ../src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s est déjà membre du groupe."
+#: src/commandhandler.cpp:176
+msgid "/w > Alias of msg"
+msgstr "/w > Alias de msg"
 
-#: ../src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s n'est pas membre de votre groupe !"
+#: src/commandhandler.cpp:177
+msgid "/query > Makes a tab for private messages with another user"
+msgstr ""
+"/query > Crée un nouvel onglet pour vos messages privés avec un autre "
+"utilisateur"
 
-#: ../src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s est maintenant membre de votre groupe."
+#: src/commandhandler.cpp:179
+msgid "/q > Alias of query"
+msgstr "/q > Alias de query"
 
-#: ../src/net/manaserv/partyhandler.cpp:106
-#, fuzzy, c-format
-msgid "%s joined the party."
+#: src/commandhandler.cpp:181
+msgid "/away > Tell the other whispering players you're away from keyboard."
 msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"%s a rejoind le groupe.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"%s a rejoint le groupe."
-
-#: ../src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr "%s a quitté le canal"
+"/away > Indique aux autres joueurs que vous n'êtes actuellement pas actif."
 
-#: ../src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s a refusé votre invitation."
+#: src/commandhandler.cpp:184
+msgid "/ignore > ignore a player"
+msgstr "/ignore > Ignore un joueur"
 
-#: ../src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s a refusé votre invitation."
+#: src/commandhandler.cpp:185
+msgid "/unignore > stop ignoring a player"
+msgstr "/unignore > Cesse d'ignorer un joueur"
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
+#: src/commandhandler.cpp:187
+msgid "/list > Display all public channels"
+msgstr "/list > Affiche une liste de tous les salons publics"
 
-#: ../src/gui/widgets/chattab.cpp:152
-#, c-format
-msgid "%s whispers: %s"
-msgstr "Message privé de %s : %s"
+#: src/commandhandler.cpp:188
+msgid "/join > Join or create a channel"
+msgstr "/join > Rejoindre ou créer un salon."
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
-msgid "(empty)"
-msgstr "(vide)"
+#: src/commandhandler.cpp:190
+msgid "/createparty > Create a new party"
+msgstr "/createparty > Créer un nouveau groupe"
 
-#: ../src/commandhandler.cpp:222
-msgid "*** only available to a GM ***"
-msgstr "*** uniquement disponible pour les MJ ***"
+#: src/commandhandler.cpp:191
+msgid "/party > Invite a user to party"
+msgstr "/party > Invite un utilisateur dans un groupe"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
-msgid "+"
-msgstr "+"
+#: src/commandhandler.cpp:193
+msgid "/record > Start recording the chat to an external file"
+msgstr ""
+"/record > Commence à enregistrer la conversation dans un fichier externe"
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
-msgid "-"
-msgstr "-"
+#: src/commandhandler.cpp:195
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr ""
+"/toggle > Détermine si la touche <entrée> bascule l'historique du tchat"
 
-#: ../src/commandhandler.cpp:166
-msgid "-- Help --"
-msgstr "-- Aide --"
+#: src/commandhandler.cpp:197
+msgid "/present > Get list of players present (sent to chat log, if logging)"
+msgstr ""
+"/present > Obtiens la liste des joueurs présents (envoyée dans l'historique "
+"du tchat s'il a été activé)"
 
-#: ../src/commandhandler.cpp:201
+#: src/commandhandler.cpp:200
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Annonce globale (MJ uniquement)"
 
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-"/away > Indique aux autres joueurs que vous n'êtes actuellement pas actif."
+#: src/commandhandler.cpp:204
+msgid "For more information, type /help <command>."
+msgstr "Pour plus d'informations, taper /help <command>"
 
-#: ../src/commandhandler.cpp:173
-msgid "/clear > Clears this window"
-msgstr "/clear > Vide cette fenêtre"
+#: src/commandhandler.cpp:208
+msgid "Command: /help"
+msgstr "Commande : /help"
 
-#: ../src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Ferme l'onglet de conversation privée"
+#: src/commandhandler.cpp:209
+msgid "This command displays a list of all commands available."
+msgstr "Cette commande affiche une liste de toutes les commandes disponibles."
 
-#: ../src/commandhandler.cpp:191
-msgid "/createparty > Create a new party"
-msgstr "/createparty > Créer un nouveau groupe"
+#: src/commandhandler.cpp:211
+msgid "Command: /help <command>"
+msgstr "Commande : /help <commande>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Affiche / Modifie les préférences d'expérience du groupe"
+#: src/commandhandler.cpp:212
+msgid "This command displays help on <command>."
+msgstr "Cette commande affiche une aide sur la commande <command>."
 
-#: ../src/commandhandler.cpp:167
-msgid "/help > Display this help"
-msgstr "/help > Montre l'aide"
+#: src/commandhandler.cpp:220
+msgid "Command: /announce <msg>"
+msgstr "Commande : /announce <msg>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Affiche cette aide."
+#: src/commandhandler.cpp:221
+msgid "*** only available to a GM ***"
+msgstr "*** uniquement disponible pour les MJ ***"
 
-#: ../src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
-msgstr "/ignore > Ignore l'autre joueur"
+#: src/commandhandler.cpp:222
+msgid "This command sends the message <msg> to all players currently online."
+msgstr "Cette commande envoie le message <msg> à tous les joueurs en ligne."
 
-#: ../src/commandhandler.cpp:185
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Ignore un joueur"
+#: src/commandhandler.cpp:227
+msgid "Command: /clear"
+msgstr "Commande : /clear"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invite un joueur à rejoindre votre guilde"
+#: src/commandhandler.cpp:228
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+"Cette commande vide l'historique de conversation de la conversation "
+"précédente."
 
-#: ../src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Invite un joueur à rejoindre votre groupe"
+#: src/commandhandler.cpp:232
+msgid "Command: /ignore <player>"
+msgstr "Commande : /ignore <joueur>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > Affiche / Modifie les préférences d'échange d'objet du groupe"
+#: src/commandhandler.cpp:233
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Cette commande ignore le joueur qu'il soit indiqué comme ami ou non."
 
-#: ../src/commandhandler.cpp:189
-msgid "/join > Join or create a channel"
-msgstr "/join > Rejoindre ou créer un salon."
+#: src/commandhandler.cpp:238
+msgid "Command: /join <channel>"
+msgstr "Commande : /join <channel>"
 
-#: ../src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Sortir un utilisateur du salon"
+#: src/commandhandler.cpp:239
+msgid "This command makes you enter <channel>."
+msgstr "Cette commande vous fait rentrer dans le salon <channel>."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Ejecter quelqu'un du groupe dont vous faites partie"
+#: src/commandhandler.cpp:240
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Si <channel> n'existe pas, il sera créé."
 
-#: ../src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
+#: src/commandhandler.cpp:244
+msgid "Command: /list"
+msgstr "Commande : /list"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Quitter la guilde courante"
+#: src/commandhandler.cpp:245
+msgid "This command shows a list of all channels."
+msgstr "Cette commande affiche une liste de tous les salons publics."
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Quitte le groupe dans lequel vous vous trouvez"
+#: src/commandhandler.cpp:249
+msgid "Command: /me <message>"
+msgstr "Commande : /me <message>"
 
-#: ../src/commandhandler.cpp:188
-msgid "/list > Display all public channels"
-msgstr "/list > Affiche une liste de tous les salons publics"
+#: src/commandhandler.cpp:250
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Cette commande informe les autres joueurs que vous faites <msg>."
 
-#: ../src/commandhandler.cpp:171
-msgid "/me > Tell something about yourself"
-msgstr "/me > Dire quelque chose à votre propos"
+#: src/commandhandler.cpp:254
+msgid "Command: /msg <nick> <message>"
+msgstr "Commande : /msg <nick> <message>"
 
-#: ../src/commandhandler.cpp:175
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Envoie un message privé à un utilisateur"
+#: src/commandhandler.cpp:255
+msgid "Command: /whisper <nick> <message>"
+msgstr "Commande : /whisper <nick> <message>"
 
-#: ../src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Faire de l'utilisateur un opérateur du salon"
+#: src/commandhandler.cpp:256
+msgid "Command: /w <nick> <message>"
+msgstr "Commande : /w <nick> <message>"
 
-#: ../src/commandhandler.cpp:192
-msgid "/party > Invite a user to party"
-msgstr "/party > Invite un utilisateur dans un groupe"
+#: src/commandhandler.cpp:257
+msgid "This command sends the text <message> to <nick>."
+msgstr "Cette commande envoie le texte <message> au joueur <nick>"
 
-#: ../src/commandhandler.cpp:198
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
-"/present > Obtiens la liste des joueurs présents (envoyée dans l'historique "
-"du tchat s'il a été activé)"
-
-#: ../src/commandhandler.cpp:180
-msgid "/q > Alias of query"
-msgstr "/q > Alias de query"
+"Si le <nick> contient des espaces, entourez le de guillemets (exemple : \"ni "
+"ck\")."
 
-#: ../src/commandhandler.cpp:178
-msgid "/query > Makes a tab for private messages with another user"
-msgstr ""
-"/query > Crée un nouvel onglet pour vos messages privés avec un autre "
-"utilisateur"
+#: src/commandhandler.cpp:263
+msgid "Command: /query <nick>"
+msgstr "Commande : /query <nick>"
 
-#: ../src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Quitter un salon"
+#: src/commandhandler.cpp:264
+msgid "Command: /q <nick>"
+msgstr "Commande : /q <nick>"
 
-#: ../src/commandhandler.cpp:194
-msgid "/record > Start recording the chat to an external file"
+#: src/commandhandler.cpp:265
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
-"/record > Commence à enregistrer la conversation dans un fichier externe"
+"Cette commande essaye de créer une fenêtre de dialogue entre vous et <nick>"
 
-#: ../src/commandhandler.cpp:196
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:270
+msgid "Command: /away <afk reason>"
+msgstr "Commande : /away <message d'absence>"
+
+#: src/commandhandler.cpp:271
+msgid "This command tells you're away from keyboard with the given reason."
 msgstr ""
-"/toggle > Détermine si la touche <entrée> bascule l'historique du tchat"
+"Cette commande indique que vous n'êtes pas actif en indiquant la raison."
 
-#: ../src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Change le sujet du salon"
+#: src/commandhandler.cpp:273
+msgid "Command: /away"
+msgstr "Commande : /away"
 
-#: ../src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
-msgstr "/unignore > Cesse d'ignorer l'autre joueur"
+#: src/commandhandler.cpp:274
+msgid "This command clears the away status and message."
+msgstr "Cette commande retire le statut absent."
 
-#: ../src/commandhandler.cpp:186
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Cesse d'ignorer un joueur"
+#: src/commandhandler.cpp:278
+msgid "Command: /createparty <name>"
+msgstr "Commande : /createparty <nom du groupe>"
 
-#: ../src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Affiche la liste des utilisateurs de ce salon"
+#: src/commandhandler.cpp:279
+msgid "This command creates a new party called <name>."
+msgstr "Cette commande crée un nouveau groupe appelé <name>"
 
-#: ../src/commandhandler.cpp:177
-msgid "/w > Alias of msg"
-msgstr "/w > Alias de msg"
+#: src/commandhandler.cpp:283
+msgid "Command: /party <nick>"
+msgstr "Commande : /party <nick>"
 
-#: ../src/commandhandler.cpp:169
-msgid "/where > Display map name"
-msgstr "/where > Affiche le nom de la carte"
+#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Cette commande invite <nick> à rejoindre votre groupe."
 
-#: ../src/commandhandler.cpp:176
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias de msg"
+#: src/commandhandler.cpp:290
+msgid "Command: /present"
+msgstr "Commande : /present"
 
-#: ../src/commandhandler.cpp:170
-msgid "/who > Display number of online users"
-msgstr "/who > Affiche le nombre d'utilisateurs en ligne"
+#: src/commandhandler.cpp:291
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+"Cette commande récupère une liste de tous les joueurs présents et l'envoie "
+"dans le fichier d'enregistrement s'il est activé, ou dans l'enregistrement "
+"de la conversation."
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr "<"
+#: src/commandhandler.cpp:297
+msgid "Command: /record <filename>"
+msgstr "Commande : /record <filename>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+#: src/commandhandler.cpp:298
+msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
-"<préférences> peut être \"1\", \"yes\", \"true\" pour activer le partage "
-"d'expérience, ou \"0\", \"no\", \"false\" pour le désactiver."
+"Cette commande active l'enregistrement de la conversation dans le fichier "
+"<filename>."
+
+#: src/commandhandler.cpp:300
+msgid "Command: /record"
+msgstr "Commande : /record"
+
+#: src/commandhandler.cpp:301
+msgid "This command finishes a recording session."
+msgstr "Cette commande termine une session d'enregistrement."
+
+#: src/commandhandler.cpp:305
+msgid "Command: /toggle <state>"
+msgstr "Command: /toggle <state>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/commandhandler.cpp:306
+#, fuzzy
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
-"<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange "
-"d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Cette commande définie si la touche entrée doit fermer le fichier "
+"d'enregistrement de la conversation ou si celui-ci se fermera "
+"automatiquement.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Cette commande définit si la touche entrée doit fermer le fichier "
+"d'enregistrement de la conversation ou si celui-ci se fermera "
+"automatiquement."
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:308
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -442,3162 +425,2957 @@ msgstr ""
 "<state> peut être en position \"1\", \"yes\", \"true\" pour activer le "
 "bouton sur marche, ou \"0\", \"no\", \"false\" pour désactiver le bouton."
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ">"
-
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
-
-#: ../src/gui/socialwindow.cpp:566
-msgid "Accept Guild Invite"
-msgstr "Accepter l'invitation dans cette guilde"
-
-#: ../src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Accepter l'invitation pour ce groupe"
-
-#: ../src/gui/socialwindow.cpp:466
-#, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Invitation dans la guilde acceptée de la part de %s."
-
-#: ../src/gui/socialwindow.cpp:447
-#, c-format
-msgid "Accepted party invite from %s."
-msgstr "Invitation dans le groupe acceptée de la part de %s."
+#: src/commandhandler.cpp:311
+msgid "Command: /toggle"
+msgstr "Commande : /toggle"
 
-#: ../src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Accepter les requêtes d'échanges entrantes"
+#: src/commandhandler.cpp:312
+msgid "This command displays the return toggle status."
+msgstr "Cette commande vous affiche le status du toggle courant."
 
-#: ../src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Accepter les demandes d'échanges."
+#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+msgid "Command: /unignore <player>"
+msgstr "Commande : /unignore <joueur>"
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
+#: src/commandhandler.cpp:317
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+"Cette commande fait cesser d'ignorer le joueur donné s'il l'était "
+"précédemment."
 
-#: ../src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Gestion du compte et du personnage"
+#: src/commandhandler.cpp:322
+msgid "Command: /where"
+msgstr "Commande : /where"
 
-#: ../src/net/manaserv/loginhandler.cpp:272
-msgid "Account banned"
-msgstr "Compte banni"
+#: src/commandhandler.cpp:323
+msgid "This command displays the name of the current map."
+msgstr "Cette commande affiche le nom de la carte où vous vous trouvez."
 
-#: ../src/net/manaserv/loginhandler.cpp:93
-msgid "Account banned."
-msgstr "Compte banni."
+#: src/commandhandler.cpp:327
+msgid "Command: /who"
+msgstr "Commande : /who"
 
-#: ../src/net/tmwa/loginhandler.cpp:162
-msgid "Account expired."
-msgstr "Le compte a expiré."
+#: src/commandhandler.cpp:328
+msgid "This command displays the number of players currently online."
+msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Compte non connecté. Identifiez-vous tout d'abord."
+#: src/commandhandler.cpp:334
+msgid "Type /help for a list of commands."
+msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
 
-#: ../src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
+#: src/commandhandler.cpp:400
+msgid "Cannot send empty whispers!"
+msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
 
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
+#: src/commandhandler.cpp:408
 #, c-format
-msgid "Account: %s"
-msgstr "Compte : %s"
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"Il ne peut être créer une fenêtre de conversation avec nick \"%s\" ! Elle "
+"existe déjà ou il s'agit de vous même."
 
-#: ../src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Ajouter"
+#: src/commandhandler.cpp:422
+#, fuzzy, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Il vous est demandé de rejoindre le chan %s.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Il vous est demandé de rejoindre le salon %s."
 
-#: ../src/gui/popupmenu.cpp:171
-msgid "Add name to chat"
-msgstr "Ajouter les noms dans le flux de conversation"
+#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Indiquez un nom de groupe."
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
-msgid "Add to chat"
-msgstr "Ajouter à la conversation"
+#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
+#: src/commandhandler.cpp:547
+msgid "Please specify a name."
+msgstr "Veuillez indiquer un nom."
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Agilité"
+#: src/commandhandler.cpp:466
+msgid "Return toggles chat."
+msgstr "La touche enter ferme maintenant la ligne d'entrée du chat."
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "Agilité %+d"
+#: src/commandhandler.cpp:466
+msgid "Message closes chat."
+msgstr "Ce message ferme la conversation."
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Agilité :"
+#: src/commandhandler.cpp:475
+msgid "Return now toggles chat."
+msgstr "La touche enter ferme la ligne d'entrée de la conversation."
 
-#: ../src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Accepter l'échange"
+#: src/commandhandler.cpp:479
+msgid "Message now closes chat."
+msgstr "Ce message ferme maintenant la conversation."
 
-#: ../src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Accepté. En attente..."
+#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+msgid "Show IP: On"
+msgstr "Afficher l'IP : Activé"
 
-#: ../src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "Tout"
+#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+msgid "Show IP: Off"
+msgstr "Afficher l'IP : Désactivé"
 
-#: ../src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Autoriser les échanges"
+#: src/commandhandler.cpp:531
+msgid "Player already ignored!"
+msgstr "Le joueur est déjà ignoré !"
 
-#: ../src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Autoriser les messages privés"
+#: src/commandhandler.cpp:538
+msgid "Player successfully ignored!"
+msgstr "Le joueur est désormais ignoré !"
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr "Déjà connecté."
+#: src/commandhandler.cpp:540
+msgid "Player could not be ignored!"
+msgstr "Le joueur n'a pas pu être ignoré !"
 
-#: ../src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Enregistrement en cours."
+#: src/commandhandler.cpp:555
+msgid "Player wasn't ignored!"
+msgstr "Le joueur n'était pas ignoré !"
 
-#: ../src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Effets ambiants"
+#: src/commandhandler.cpp:560
+msgid "Player no longer ignored!"
+msgstr "Le joueur n'est plus ignoré !"
 
-#: ../src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
-msgstr "Effets ambiants : %s"
+#: src/commandhandler.cpp:562
+msgid "Player could not be unignored!"
+msgstr "Le joueur n'a pas pu être à nouveau écouté !"
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/commandhandler.h:31
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Un membre inconnu a essayé de dire : %s"
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
+"\", \"false\", \"1\", \"0\"."
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Vaporisé."
+#: src/game.cpp:169
+msgid "General"
+msgstr "Général"
 
-#: ../src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Appliquer"
+#: src/game.cpp:333
+msgid "Screenshot saved as "
+msgstr "Capture d'écran sauvegardée en tant que"
 
-#: ../src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr ""
-"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
+#: src/game.cpp:338
+msgid "Saving screenshot failed!"
+msgstr "Impossible de sauvegarder la capture d'écran !"
 
-#: ../src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
+#: src/game.cpp:368
+msgid "The connection to the server was lost."
 msgstr ""
-"Il est nécessaire de redémarrer le client pour appliquer les changements "
-"liés à OpenGL. Si OpenGL empêche un affichage correct, redémarrez le jeu "
-"avec l'option en ligne de commande : \"--no-opengl\"."
-
-#: ../src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
+"La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
-#: ../src/gui/socialwindow.cpp:168
-#, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
+#: src/game.cpp:372
+msgid "Network Error"
+msgstr "Erreur Réseau"
 
-#: ../src/gui/socialwindow.cpp:247
-#, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
+#: src/game.cpp:713
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: ../src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Assigner"
+#: src/game.cpp:720
+msgid "Accepting incoming trade requests"
+msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Attaquer"
+#: src/game.cpp:950
+msgid "Could Not Load Map"
+msgstr "La carte n'a pu être chargé"
 
-#: ../src/resources/itemdb.cpp:53
+#: src/game.cpp:951
 #, c-format
-msgid "Attack %+d"
-msgstr "Attaque %+d"
+msgid "Error while loading %s"
+msgstr "Erreur durant le chargement %s"
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: src/gui/beingpopup.cpp:76
 #, c-format
-msgid "Attack %s"
-msgstr "Attaquer %s"
-
-#: ../src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "Présence inscrite dans le fichier d'enregistrement."
+msgid "Party: %s"
+msgstr "Groupe : %s"
 
-#: ../src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Audio"
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Acheter"
 
-#: ../src/net/tmwa/generalhandler.cpp:129
-msgid "Authentication failed."
-msgstr "Échec de l'authentification."
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:278
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Prix : %s / Total : %s"
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
-msgstr "Inactif"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+msgid "+"
+msgstr "+"
 
-#: ../src/gui/popupmenu.cpp:100
-#, c-format
-msgid "Befriend %s"
-msgstr "Être ami avec %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+msgid "-"
+msgstr "-"
 
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Forme de vie"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Quitter"
 
-#: ../src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Privé de toute essence de vie, vous reposez en paix."
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
+#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+msgid "Max"
+msgstr "Max."
 
-#: ../src/playerrelations.cpp:342
-msgid "Blink name"
-msgstr "Fais clignoter le nom"
+#: src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Magasin"
 
-#: ../src/gui/setup_colors.cpp:138
-msgid "Blue:"
-msgstr "Bleu : "
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Vendre"
 
-#: ../src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Bulles avec noms"
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Annuler"
 
-#: ../src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Bulles, sans noms"
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Modifier l'adresse mail"
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Acheter"
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#, c-format
+msgid "Account: %s"
+msgstr "Compte : %s"
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Calibrer"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr "Entrer l'adresse email deux fois :"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Annuler"
+#: src/gui/changeemaildialog.cpp:127
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "L'adresse email doit être longue d'au moins %d caractères."
 
-#: ../src/commandhandler.cpp:422
+#: src/gui/changeemaildialog.cpp:134
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"Il ne peut être créer une fenêtre de conversation avec nick \"%s\" ! Elle "
-"existe déjà ou il s'agit de vous même."
+msgid "The new email address needs to be less than %d characters long."
+msgstr "L'adresse email ne doit pas être plus longue que %d caractères."
 
-#: ../src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
-msgstr "Ne peut pas créer un groupe. Vous faites déjà partie d'un groupe."
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr "Les deux adresses email ne correspondent pas."
 
-#: ../src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
-msgstr "Ne peut pas augmenter la capacité !"
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
+msgid "Change Password"
+msgstr "Changer le mot de passe"
 
-#: ../src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "Impossible d'envoyer une conversation vide !"
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Mot de passe :"
 
-#: ../src/commandhandler.cpp:401
-msgid "Cannot send empty whispers!"
-msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
+#: src/gui/changepassworddialog.cpp:63
+msgid "Type new password twice:"
+msgstr "Entrer le mot de passe deux fois :"
 
-#: ../src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Vous ne pouvez pas crier !"
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr "Entrez d'abord l'ancien mot de passe."
+
+#: src/gui/changepassworddialog.cpp:116
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Le mot de passe doit être long d'au moins %d caractères."
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
+#: src/gui/changepassworddialog.cpp:123
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Le mot de passe ne doit pas être plus long que %d caractères."
+
+#: src/gui/changepassworddialog.cpp:130
 #, fuzzy
-msgid "Cannot use this ID."
+msgid "The new password entries mismatch."
 msgstr ""
 "#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Impossible d'utiliser cet Id.\n"
+"Les anciens mots de passe ne correspondent pas.\n"
 "#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Impossible d'utiliser cette Id."
+"Les nouveaux mots de passe ne correspondent pas."
 
-#: ../src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Changer"
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Création du personnage"
 
-#: ../src/gui/charselectdialog.cpp:150
-msgid "Change Email"
-msgstr "Modifier l'adresse email"
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Nom :"
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Modifier l'adresse mail"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ">"
 
-#: ../src/gui/worldselectdialog.cpp:76
-msgid "Change Login"
-msgstr "Changer de Login"
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr "<"
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Changer le mot de passe"
+#: src/gui/charcreatedialog.cpp:74
+msgid "Hair color:"
+msgstr "Couleur des cheveux :"
 
-#: ../src/gui/login.cpp:62
-msgid "Change Server"
-msgstr "Changer de Serveur"
+#: src/gui/charcreatedialog.cpp:77
+msgid "Hair style:"
+msgstr "Coupe de cheveux :"
 
-#: ../src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "Les changements seront appliqués au changement de carte."
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
+#: src/gui/socialwindow.cpp:333
+msgid "Create"
+msgstr "Créer"
 
-#: ../src/client.cpp:813
-msgid "Changing game servers"
-msgstr "Changement de serveur de jeu"
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "Masculin"
 
-#: ../src/gui/setup_video.cpp:460
-msgid "Changing to OpenGL"
-msgstr "Activation d'OpenGL"
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "Féminin"
 
-#: ../src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
-msgstr ""
-"Seul les opérateurs du salon peuvent sortir des utilisateurs et donner les "
-"droit d'opérateur aux autres utilisateurs du salon."
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Veuillez distribuer %d points"
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "Les salons ne sont pas gérés !"
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "Votre nom doit comporter un minimum de 4 caractères."
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Personnage supprimé."
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
+msgstr "Caractéristiques du personnage Ok"
 
-#: ../src/gui/statuswindow.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
-msgid "Character points: %d"
-msgstr "Points de personnage : %d"
+msgid "Please remove %d points"
+msgstr "Veuillez retirer %d points"
 
-#: ../src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Caractéristiques du personnage Ok"
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Confirmer la suppression du personnage"
 
-#: ../src/net/manaserv/charhandler.cpp:143
-msgid "Character's name already exists."
-msgstr "Ce personnage existe déjà."
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 
-#: ../src/net/manaserv/charhandler.cpp:155
-msgid "Character's stats are too high."
-msgstr "Les caractéristiques du personnage sont trop hautes."
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr "Gestion du compte et du personnage"
 
-#: ../src/net/manaserv/charhandler.cpp:158
-msgid "Character's stats are too low."
-msgstr "Les caractéristiques du personnage sont trop basses."
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr "Changer de login"
 
-#: ../src/gui/chat.cpp:87
-msgid "Chat"
-msgstr "Conversation"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Se désinscrire"
 
-#: ../src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Fenêtre de conversation"
+#: src/gui/charselectdialog.cpp:150
+msgid "Change Email"
+msgstr "Modifier l'adresse email"
 
-#: ../src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Vous n'avez pas pu créer la conversation !"
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
+#: src/gui/setup_players.cpp:228
+msgid "Delete"
+msgstr "Supprimer"
 
-#: ../src/gui/charselectdialog.cpp:380
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr "Choisir"
 
-#: ../src/gui/worldselectdialog.cpp:77
-msgid "Choose World"
-msgstr "Choix du monde"
+#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+msgid "(empty)"
+msgstr "(vide)"
 
-#: ../src/gui/serverdialog.cpp:196
-msgid "Choose Your Server"
-msgstr "Choisissez le serveur"
+#: src/gui/chat.cpp:87
+msgid "Chat"
+msgstr "Conversation"
 
-#: ../src/gui/socialwindow.cpp:544
-msgid "Choose your guild's name."
-msgstr "Choisissez le nom de la guilde."
+#: src/gui/chat.cpp:307
+#, c-format
+msgid "Present: %s; %d players are present."
+msgstr "Présents : %s ; %d joueurs sont présents."
 
-#: ../src/gui/socialwindow.cpp:630
-msgid "Choose your party's name."
-msgstr "Choisissez le nom du groupe."
+#: src/gui/chat.cpp:325
+msgid "Attendance written to record log."
+msgstr "Présence inscrite dans le fichier d'enregistrement."
 
-#: ../src/gui/npcdialog.cpp:98
-msgid "Clear log"
-msgstr "Effacer le log"
+#: src/gui/chat.cpp:452
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Message privé envoyé à %s : %s"
 
-#: ../src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-"L'enregistrement de comptes en utilisant le client n'est pas permis. "
-"Veuillez contacter l'administrateur du serveur."
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Oui"
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr "La version de votre client est trop ancienne."
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Non"
 
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
-msgid "Close"
-msgstr "Fermer"
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr "Debug"
 
-#: ../src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Couleurs"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr "%d FPS (OpenGL)"
 
-#: ../src/commandhandler.cpp:221
-msgid "Command: /announce <msg>"
-msgstr "Commande : /announce <msg>"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr "%d FPS"
 
-#: ../src/commandhandler.cpp:274
-msgid "Command: /away"
-msgstr "Commande : /away"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
+msgstr "Musique : %s"
 
-#: ../src/commandhandler.cpp:271
-msgid "Command: /away <afk reason>"
-msgstr "Commande : /away <message d'absence>"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, c-format
+msgid "Map: %s"
+msgstr "Carte : %s"
 
-#: ../src/commandhandler.cpp:228
-msgid "Command: /clear"
-msgstr "Commande : /clear"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
+msgstr "Plan : %s"
 
-#: ../src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Commande : /close"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr "Curseur : (%d, %d)"
 
-#: ../src/commandhandler.cpp:279
-msgid "Command: /createparty <name>"
-msgstr "Commande : /createparty <nom du groupe>"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
+msgstr "Effets de particules : %d"
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Commande : /exp"
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
+msgstr "Détail des particules : %s"
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Commande : /exp <policy>"
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
+msgstr "Effets ambiants : %s"
 
-#: ../src/commandhandler.cpp:209
-msgid "Command: /help"
-msgstr "Commande : /help"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Équipement"
 
-#: ../src/commandhandler.cpp:212
-msgid "Command: /help <command>"
-msgstr "Commande : /help <commande>"
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
+#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+msgid "Unequip"
+msgstr "Retirer"
 
-#: ../src/gui/widgets/whispertab.cpp:88
-msgid "Command: /ignore"
-msgstr "Commande : /ignore"
+#: src/gui/help.cpp:37
+msgid "Help"
+msgstr "Aide"
 
-#: ../src/commandhandler.cpp:233
-msgid "Command: /ignore <player>"
-msgstr "Commande : /ignore <joueur>"
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+msgid "Close"
+msgstr "Fermer"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Commande : /invite <nick>"
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inventaire"
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Commande : /item"
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Stockage"
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Commande : /item <policy>"
+#: src/gui/inventorywindow.cpp:80
+msgid "Slots:"
+msgstr "Cases :"
 
-#: ../src/commandhandler.cpp:239
-msgid "Command: /join <channel>"
-msgstr "Commande : /join <channel>"
+#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
+#: src/gui/popupmenu.cpp:352
+msgid "Equip"
+msgstr "Équiper"
 
-#: ../src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Commande : /kick <nick>"
+#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
+#: src/gui/popupmenu.cpp:355
+msgid "Use"
+msgstr "Utiliser"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Commande : /leave"
+#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
+#: src/gui/popupmenu.cpp:358
+msgid "Drop..."
+msgstr "Jeter..."
 
-#: ../src/commandhandler.cpp:245
-msgid "Command: /list"
-msgstr "Commande : /list"
+#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+msgid "Split"
+msgstr "Partager"
 
-#: ../src/commandhandler.cpp:250
-msgid "Command: /me <message>"
-msgstr "Commande : /me <message>"
+#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr "Tenues"
 
-#: ../src/commandhandler.cpp:255
-msgid "Command: /msg <nick> <message>"
-msgstr "Commande : /msg <nick> <message>"
+#: src/gui/inventorywindow.cpp:103
+msgid "Weight:"
+msgstr "Poids :"
 
-#: ../src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Commande : /op <nick>"
+#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+msgid "Store"
+msgstr "Entreposer"
 
-#: ../src/commandhandler.cpp:284
-msgid "Command: /party <nick>"
-msgstr "Commande : /party <nick>"
+#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+msgid "Retrieve"
+msgstr "Récupérer"
 
-#: ../src/commandhandler.cpp:291
-msgid "Command: /present"
-msgstr "Commande : /present"
+#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+msgid "Drop"
+msgstr "Jeter"
 
-#: ../src/commandhandler.cpp:265
-msgid "Command: /q <nick>"
-msgstr "Commande : /q <nick>"
+#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:73
+msgid "OK"
+msgstr "Ok"
 
-#: ../src/commandhandler.cpp:264
-msgid "Command: /query <nick>"
-msgstr "Commande : /query <nick>"
+#: src/gui/itemamount.cpp:105
+msgid "All"
+msgstr "Tout"
 
-#: ../src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Commande : /quit"
+#: src/gui/itemamount.cpp:131
+msgid "Select amount of items to trade."
+msgstr "Choisissez le nombre d'objets à troquer."
 
-#: ../src/commandhandler.cpp:301
-msgid "Command: /record"
-msgstr "Commande : /record"
+#: src/gui/itemamount.cpp:134
+msgid "Select amount of items to drop."
+msgstr "Choisissez le nombre d'objets à jeter."
 
-#: ../src/commandhandler.cpp:298
-msgid "Command: /record <filename>"
-msgstr "Commande : /record <filename>"
+#: src/gui/itemamount.cpp:137
+msgid "Select amount of items to store."
+msgstr "Sélectionnez le nombre d'objets à stocker."
 
-#: ../src/commandhandler.cpp:312
-msgid "Command: /toggle"
-msgstr "Commande : /toggle"
+#: src/gui/itemamount.cpp:140
+msgid "Select amount of items to retrieve."
+msgstr "Sélectionnez le nombre d'objet à reprendre"
 
-#: ../src/commandhandler.cpp:306
-msgid "Command: /toggle <state>"
-msgstr "Command: /toggle <state>"
+#: src/gui/itemamount.cpp:143
+msgid "Select amount of items to split."
+msgstr "Choisissez le nombre d'objets à déplacer."
 
-#: ../src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Commande: /topic <message>"
+#: src/gui/itempopup.cpp:126
+#, c-format
+msgid "Weight: %s"
+msgstr "Poids : %s"
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
-msgid "Command: /unignore <player>"
-msgstr "Commande : /unignore <joueur>"
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
+msgid "Login"
+msgstr "Connexion"
 
-#: ../src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Commande : /users"
+#: src/gui/login.cpp:60
+msgid "Remember username"
+msgstr "Se souvenir du nom d'utilisateur"
 
-#: ../src/commandhandler.cpp:257
-msgid "Command: /w <nick> <message>"
-msgstr "Commande : /w <nick> <message>"
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "S'inscrire"
 
-#: ../src/commandhandler.cpp:323
-msgid "Command: /where"
-msgstr "Commande : /where"
+#: src/gui/login.cpp:62
+msgid "Change Server"
+msgstr "Changer de Serveur"
 
-#: ../src/commandhandler.cpp:256
-msgid "Command: /whisper <nick> <message>"
-msgstr "Commande : /whisper <nick> <message>"
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr "Enregistrement désactivé"
 
-#: ../src/commandhandler.cpp:328
-msgid "Command: /who"
-msgstr "Commande : /who"
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+"Veuillez enregistrer votre compte sur la page du site prévue à cet effet."
 
-#: ../src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Terminé"
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+msgid "Map"
+msgstr "Plan"
 
-#: ../src/playerrelations.cpp:312
-msgid "Completely ignore"
-msgstr "Ignorer complètement"
+#: src/gui/ministatus.cpp:157
+msgid "Need"
+msgstr "Restant"
 
-#: ../src/gui/popupmenu.cpp:117
-#, c-format
-msgid "Completely ignore %s"
-msgstr "Ignorer complètement %s"
+#: src/gui/npcdialog.cpp:45
+msgid "Waiting for server"
+msgstr "Attente du serveur"
 
-#: ../src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Confirmer la suppression du personnage"
+#: src/gui/npcdialog.cpp:46
+msgid "Next"
+msgstr "Suivant"
 
-#: ../src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Vérification :"
+#: src/gui/npcdialog.cpp:48
+msgid "Submit"
+msgstr "Soumettre"
 
-#: ../src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Confirmé. En attente..."
+#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "PNJ"
 
-#: ../src/keyboardconfig.cpp:184
-#, c-format
+#: src/gui/npcdialog.cpp:98
+msgid "Clear log"
+msgstr "Effacer le log"
+
+#: src/gui/npcdialog.cpp:114
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:183
 msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
+"\n"
+"> Next\n"
 msgstr ""
-"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une "
-"des touches ou attendez vous à un possible comportement étrange du jeu."
-
-#: ../src/gui/serverdialog.cpp:233
-msgid "Connect"
-msgstr "Connexion..."
+"\n"
+"> Suivant\n"
 
-#: ../src/client.cpp:655
-msgid "Connecting to server"
-msgstr "Connexion au serveur"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "A :"
 
-#: ../src/client.cpp:803
-msgid "Connecting to the game server"
-msgstr "Connexion au serveur de jeu"
+#: src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Envoyer"
 
-#: ../src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Connexion..."
+#: src/gui/npcpostdialog.cpp:96
+msgid "Failed to send as sender or letter invalid."
+msgstr "Echec de l'envoi comme émetteur ou caractère invalide."
 
-#: ../src/net/tmwa/network.cpp:414
-msgid "Connection to server terminated. "
-msgstr "Connexion au serveur terminée."
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr "Tenue : %d"
 
-#: ../src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr "Copier la tenue"
+#: src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr "Retirer d'abord l'équipement"
 
-#: ../src/gui/statuswindow.cpp:244
+#: src/gui/popupmenu.cpp:83
 #, c-format
-msgid "Correction points: %d"
-msgstr "Points de correction : %d"
-
-#: ../src/game.cpp:950
-msgid "Could Not Load Map"
-msgstr "La carte n'a pu être chargé"
+msgid "Trade with %s..."
+msgstr "Troquer avec %s..."
 
-#: ../src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "Le groupe n'a pu être créé."
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
+#, c-format
+msgid "Attack %s"
+msgstr "Attaquer %s"
 
-#: ../src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
-msgstr "N'a pas pu inviter le joueur dans la guilde. "
+#: src/gui/popupmenu.cpp:91
+#, c-format
+msgid "Whisper %s"
+msgstr "Chuchoter à %s"
 
-#: ../src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Vous n'avez pas pu rejoindre le groupe !"
+#: src/gui/popupmenu.cpp:100
+#, c-format
+msgid "Befriend %s"
+msgstr "Être ami avec %s"
 
-#: ../src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "Vous n'avez rien pu voler..."
+#: src/gui/popupmenu.cpp:105
+#, c-format
+msgid "Disregard %s"
+msgstr "Ignorer %s"
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Créer"
+#: src/gui/popupmenu.cpp:108
+#, c-format
+msgid "Ignore %s"
+msgstr "Ignorer %s"
 
-#: ../src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Création du personnage"
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
+msgstr "Cesser d'ignorer %s"
 
-#: ../src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Créer une Guilde"
+#: src/gui/popupmenu.cpp:117
+#, c-format
+msgid "Completely ignore %s"
+msgstr "Ignorer complètement %s"
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
-msgid "Create Party"
-msgstr "Créer un groupe"
+#: src/gui/popupmenu.cpp:130
+#, c-format
+msgid "Invite %s to join your guild"
+msgstr "Inviter %s à rejoindre votre guilde"
 
-#: ../src/gui/socialwindow.cpp:507
+#: src/gui/popupmenu.cpp:134
 #, c-format
-msgid "Creating guild called %s."
-msgstr "La guilde %s a été créée."
+msgid "Invite %s to join your party"
+msgstr "Inviter %s à se joindre votre groupe"
 
-#: ../src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
-msgstr "La création de la guilde à échoué, veuillez choisir un nom plus court."
+#: src/gui/popupmenu.cpp:141
+msgid "Kick player"
+msgstr "Ejecter un joueur"
 
-#: ../src/gui/socialwindow.cpp:529
+#: src/gui/popupmenu.cpp:150
 #, c-format
-msgid "Creating party called %s."
-msgstr "Le groupe %s a été créé."
+msgid "Talk to %s"
+msgstr "Parler à %s"
 
-#: ../src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
-msgstr "La création du groupe à échoué, veuillez choisir un nom plus court."
+#: src/gui/popupmenu.cpp:163
+msgid "Kick monster"
+msgstr "Ejecter un monstre"
 
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Coup critique"
+#: src/gui/popupmenu.cpp:171
+msgid "Add name to chat"
+msgstr "Ajouter les noms dans le flux de conversation"
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/popupmenu.cpp:188
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Curseur : (%d, %d)"
+msgid "Pick up %s"
+msgstr "Ramasser %s"
 
-#: ../src/gui/serverdialog.cpp:234
-msgid "Custom Server"
-msgstr "Serveur personnalisé"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+msgid "Add to chat"
+msgstr "Ajouter à la conversation"
 
-#: ../src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "Curseur personnalisé"
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Changer de serveur"
 
-#: ../src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
-msgstr "Désactiver OpenGL"
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Changer de personnage"
 
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr "Debug"
+#: src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Fin de l'engistrement."
 
-#: ../src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Fenêtre de debug"
+#: src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Pas d'enregistrement en cours."
 
-#: ../src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Par défaut"
+#: src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Enregistrement en cours."
 
-#: ../src/net/tmwa/generalhandler.cpp:225
-msgid "Defense"
-msgstr "Défense"
+#: src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Début de l'enregistrement..."
 
-#: ../src/resources/itemdb.cpp:54
-#, c-format
-msgid "Defense %+d"
-msgstr "Défense %+d"
+#: src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Impossible de démarrer l'enregistrement."
 
-#: ../src/gui/setup_colors.cpp:93
-msgid "Delay:"
-msgstr "Délai : "
+#: src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "En cours d'enregistrement..."
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Supprimer"
+#: src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Arrêter l'enregistrement"
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Dextérité"
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Vérification :"
+
+#: src/gui/register.cpp:100
+msgid "Email:"
+msgstr "Email :"
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: src/gui/register.cpp:166
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Dextérité %+d"
+msgid "The username needs to be at least %d characters long."
+msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
 
-#: ../src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Dextérité :"
+#: src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
 
-#: ../src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
-msgstr "Désactiver la transparence (Faibles CPUs)"
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Le mot de passe doit faire au moins %d caractères."
 
-#: ../src/gui/popupmenu.cpp:105
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
-msgid "Disregard %s"
-msgstr "Ignorer %s"
+msgid "The password needs to be less than %d characters long."
+msgstr "Le mot de passe doit faire moins de %d caractères."
 
-#: ../src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Négligé"
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Les deux mots de passe sont différents"
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Voulez-vous que vos biens soient identifiés ?"
+#: src/gui/serverdialog.cpp:196
+msgid "Choose Your Server"
+msgstr "Choisissez le serveur"
 
-#: ../src/gui/setup_audio.cpp:43
-msgid "Download music"
-msgstr "Télécharger la musique"
+#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+msgid "Server:"
+msgstr "Serveur :"
+
+#: src/gui/serverdialog.cpp:209
+msgid "Port:"
+msgstr "Port :"
+
+#: src/gui/serverdialog.cpp:211
+msgid "Server type:"
+msgstr "Type de Serveur :"
+
+#: src/gui/serverdialog.cpp:233
+msgid "Connect"
+msgstr "Connexion..."
+
+#: src/gui/serverdialog.cpp:234
+msgid "Custom Server"
+msgstr "Serveur personnalisé"
 
-#: ../src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:337
+msgid "Please type both the address and the port of a server."
+msgstr "Veuillez entrer l'adresse et le port du serveur."
+
+#: src/gui/serverdialog.cpp:442
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
-msgid "Drop"
-msgstr "Jeter"
+#: src/gui/serverdialog.cpp:448
+msgid "Waiting for server..."
+msgstr "En attente du serveur..."
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
-msgid "Drop..."
-msgstr "Jeter..."
+#: src/gui/serverdialog.cpp:452
+msgid "Preparing download"
+msgstr "Préparation du téléchargement"
 
-#: ../src/net/tmwa/generalhandler.cpp:145
-msgid "Duplicated login."
-msgstr "Authentification déjà effectuée."
+#: src/gui/serverdialog.cpp:456
+msgid "Error retreiving server list!"
+msgstr "Erreur lors du téléchargement de la liste !"
 
-#: ../src/client.cpp:905
-msgid "Email Change"
-msgstr "Changer d'email"
+#: src/gui/serverdialog.cpp:556
+msgid "requires a newer version"
+msgstr "requiert une nouvelle version"
 
-#: ../src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr "Cette adresse email existe déjà."
+#: src/gui/serverdialog.cpp:558
+#, c-format
+msgid "requires v%s"
+msgstr "requiert la v%s"
 
-#: ../src/client.cpp:906
-msgid "Email changed successfully!"
-msgstr "L'adresse email a été changé avec succès !"
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Son"
 
-#: ../src/gui/register.cpp:100
-msgid "Email:"
-msgstr "Email :"
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr "Télécharger la musique"
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Raccourci d'emote %d"
+#: src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Audio"
 
-#: ../src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr "Fenêtre de raccourcis d'emote"
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Volume des effets sonores"
 
-#: ../src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Emote non realisé !"
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Volume de la musique"
 
-#: ../src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr "Une adresse vide a été donnée à la commande Network::connect() !"
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr "Message"
 
-#: ../src/gui/setup_joystick.cpp:39
-msgid "Enable joystick"
-msgstr "Activer le joystick"
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+"Le client devra être redémarré afin de vous permettre de télécharger la "
+"musique."
 
-#: ../src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Activer / Désactiver les échanges"
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr "Moteur de son"
 
-#: ../src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr "Fin de la liste du canal."
+#: src/gui/setup_colors.cpp:45
+msgid "This is what the color looks like"
+msgstr "Voilà à quoi ressemble cette couleur"
 
-#: ../src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr "Entrez d'abord l'ancien mot de passe."
+#: src/gui/setup_colors.cpp:50
+msgid "Colors"
+msgstr "Couleurs"
 
-#: ../src/client.cpp:715
-msgid "Entering game world"
-msgstr "Connexion au monde de jeu"
+#: src/gui/setup_colors.cpp:71
+msgid "Type:"
+msgstr "Type : "
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
-msgid "Equip"
-msgstr "Équiper"
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+msgid "Static"
+msgstr "Statique"
 
-#: ../src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
-msgstr "Equiper en premier les flèches"
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
+msgid "Pulse"
+msgstr "Impulsion"
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Équipement"
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
+msgid "Rainbow"
+msgstr "Arc-en-ciel"
 
-#: ../src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Fenêtre d'équipements."
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
+msgid "Spectrum"
+msgstr "Spectre"
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "Erreur"
+#: src/gui/setup_colors.cpp:93
+msgid "Delay:"
+msgstr "Délai : "
 
-#: ../src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Erreur lors de la création de la guilde."
+#: src/gui/setup_colors.cpp:108
+msgid "Red:"
+msgstr "Rouge : "
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
-msgid "Error creating updates directory!"
-msgstr "Impossible de créer le dossier de mise à jour !"
+#: src/gui/setup_colors.cpp:123
+msgid "Green:"
+msgstr "Vert : "
 
-#: ../src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr "Erreur lors de la tentative d'entrée dans le canal."
+#: src/gui/setup_colors.cpp:138
+msgid "Blue:"
+msgstr "Bleu : "
 
-#: ../src/gui/serverdialog.cpp:456
-msgid "Error retreiving server list!"
-msgstr "Erreur lors du téléchargement de la liste !"
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Appliquer"
 
-#: ../src/game.cpp:951
-#, c-format
-msgid "Error while loading %s"
-msgstr "Erreur durant le chargement %s"
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Rétablir les fenêtres"
 
-#: ../src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr "Exp"
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Presser le bouton pour démarrer la calibration"
 
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "Information d'expérience"
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Calibrer"
 
-#: ../src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "Exp :"
+#: src/gui/setup_joystick.cpp:39
+msgid "Enable joystick"
+msgstr "Activer le joystick"
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr "Partage d'expérience non authorisé."
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr "Partage d'expérience authorisé."
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Stop"
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr "Partage d'expérience impossible."
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Tourner le joystick"
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
-msgid "Experience sharing unknown."
-msgstr "Paramètre de partage d'expérience inconnu."
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Clavier"
 
-#: ../src/gui/setup_video.cpp:238
-msgid "FPS limit:"
-msgstr "Limite FPS :"
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Assigner"
 
-#: ../src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Impossible de rajouter un objet pour une raison inconnue."
+#: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr "Désassigner"
 
-#: ../src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-"Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus "
-"de place libre."
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Par défaut"
 
-#: ../src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
-"Impossible de rajouter un objet. Votre partenaire pour cet échange est "
-"surchargé."
+#: src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Conflit(s) de touche détecté"
 
-#: ../src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
-"dans cette fenêtre."
+#: src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Nom"
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
-"utilisé."
+#: src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Relation"
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "La suppresion du personnage n'a pu s\"effectuer."
+#: src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutre"
 
-#: ../src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Echec lors de la promotion du membre"
+#: src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Ami"
 
-#: ../src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "Echec de l'envoi comme émetteur ou caractère invalide."
+#: src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Négligé"
 
-#: ../src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Impossible de démarrer l'enregistrement."
+#: src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Ignoré"
 
-#: ../src/gui/setup_video.cpp:434
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
-"également pas accessible !"
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
+msgid "???"
+msgstr "???"
 
-#: ../src/gui/setup_video.cpp:428
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
-"également pas accessible !"
+#: src/gui/setup_players.cpp:224
+msgid "Allow trading"
+msgstr "Autoriser les échanges"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
-msgid "Failed to use item."
-msgstr "Impossible d'utiliser l'objet."
+#: src/gui/setup_players.cpp:226
+msgid "Allow whispers"
+msgstr "Autoriser les messages privés"
 
-#: ../src/client.cpp:927
-msgid "Farewell, come back any time..."
-msgstr "Adieu, revenez dès que vous le souhaitez..."
+#: src/gui/setup_players.cpp:230
+msgid "Put all whispers in tabs"
+msgstr "Placer tous les messages privés dans des onglets"
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
-msgid "Female"
-msgstr "Féminin"
+#: src/gui/setup_players.cpp:232
+msgid "Show gender"
+msgstr "Afficher le genre"
 
-#: ../src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "Trouver le chemin vers la souris"
+#: src/gui/setup_players.cpp:234
+msgid "Players"
+msgstr "Joueurs"
 
-#: ../src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Fin de l'engistrement."
+#: src/gui/setup_players.cpp:259
+msgid "When ignoring:"
+msgstr "Quand ignoré :"
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr "Bulle flottante '...'"
+#: src/gui/setup_video.cpp:134
+#, fuzzy
+msgid "Tiny"
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"fin\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Fin"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr "Bulle flottante"
+#: src/gui/setup_video.cpp:135
+msgid "Small"
+msgstr "Petit"
 
-#: ../src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Taille de police"
+#: src/gui/setup_video.cpp:136
+msgid "Medium"
+msgstr "Medium"
 
-#: ../src/commandhandler.cpp:205
-msgid "For more information, type /help <command>."
-msgstr "Pour plus d'informations, taper /help <command>"
+#: src/gui/setup_video.cpp:137
+msgid "Large"
+msgstr "Grand"
 
-#: ../src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Ami"
+#: src/gui/setup_video.cpp:163
+msgid "No text"
+msgstr "Pas de texte"
 
-#: ../src/gui/setup_video.cpp:219
-msgid "Full screen"
-msgstr "Plein écran"
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Texte"
 
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "Nom des MJ"
+#: src/gui/setup_video.cpp:165
+msgid "Bubbles, no names"
+msgstr "Bulles, sans noms"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
-msgid "Game"
-msgstr "Jeu"
+#: src/gui/setup_video.cpp:166
+msgid "Bubbles with names"
+msgstr "Bulles avec noms"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Fin de la partie !"
+#: src/gui/setup_video.cpp:178
+msgid "off"
+msgstr "aucun"
 
-#: ../src/game.cpp:169
-msgid "General"
-msgstr "Général"
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
+msgid "low"
+msgstr "léger"
 
-#: ../src/gui/widgets/chattab.cpp:126
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Annonce globale de %s :"
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
+msgid "high"
+msgstr "élevé"
 
-#: ../src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Annonce globale :"
+#: src/gui/setup_video.cpp:193
+msgid "medium"
+msgstr "moyen"
 
-#: ../src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
-msgstr "Vous avez été déconnecté du serveur !"
+#: src/gui/setup_video.cpp:195
+msgid "max"
+msgstr "max"
 
-#: ../src/gui/setup_colors.cpp:123
-msgid "Green:"
-msgstr "Vert : "
+#: src/gui/setup_video.cpp:219
+msgid "Full screen"
+msgstr "Plein écran"
 
-#: ../src/gui/setup_video.cpp:261
-msgid "Gui opacity"
-msgstr "Opacité de l'interface"
+#: src/gui/setup_video.cpp:220
+msgid "OpenGL"
+msgstr "Ouvrir GL"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Guilde"
+#: src/gui/setup_video.cpp:221
+msgid "Custom cursor"
+msgstr "Curseur personnalisé"
 
-#: ../src/gui/socialwindow.cpp:143
-#, c-format
-msgid "Guild %s quit requested."
-msgstr "Demande pour quitter la guilde %s effectuée."
+#: src/gui/setup_video.cpp:223
+msgid "Visible names"
+msgstr "Afficher les noms"
 
-#: ../src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr "Membres de la guilde"
+#: src/gui/setup_video.cpp:225
+msgid "Particle effects"
+msgstr "Effets de particules"
 
-#: ../src/gui/socialwindow.cpp:543
-msgid "Guild Name"
-msgstr "Nom de la guilde"
+#: src/gui/setup_video.cpp:227
+msgid "Show own name"
+msgstr "Afficher son propre nom"
 
-#: ../src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Guilde créée."
+#: src/gui/setup_video.cpp:228
+msgid "Log NPC dialogue"
+msgstr "Loguer les conversations avec les PNJ"
 
-#: ../src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
-msgstr "La création de guilde n'est pas encore supportée."
+#: src/gui/setup_video.cpp:229
+msgid "Show pickup notification"
+msgstr "Afficher les messages de ramassage"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
-msgid "Guild name is missing."
-msgstr "Le nom de la guilde est manquant."
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
+msgid "in chat"
+msgstr "dans la conversation"
 
-#: ../src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr "Vie"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:233
+msgid "as particle"
+msgstr "avec des particules"
 
-#: ../src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "PV %+d"
+#: src/gui/setup_video.cpp:238
+msgid "FPS limit:"
+msgstr "Limite FPS :"
 
-#: ../src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "Vie :"
+#: src/gui/setup_video.cpp:249
+msgid "Disable transparency (Low CPU mode)"
+msgstr "Désactiver la transparence (Faibles CPUs)"
 
-#: ../src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
-msgstr "Couleur des cheveux :"
+#: src/gui/setup_video.cpp:252
+msgid "Video"
+msgstr "Vidéo"
 
-#: ../src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
-msgstr "Coupe de cheveux :"
+#: src/gui/setup_video.cpp:254
+msgid "Show damage"
+msgstr "Afficher les dégâts"
 
-#: ../src/gui/help.cpp:37
-msgid "Help"
-msgstr "Aide"
+#: src/gui/setup_video.cpp:260
+msgid "Overhead text"
+msgstr "Texte aérien"
 
-#: ../src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Fenêtre d'Aide"
+#: src/gui/setup_video.cpp:261
+msgid "Gui opacity"
+msgstr "Opacité de l'interface"
 
-#: ../src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Cacher les fenêtres"
+#: src/gui/setup_video.cpp:262
+msgid "Ambient FX"
+msgstr "Effets ambiants"
 
-#: ../src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Hé ? Qu'est-ce donc que cela ?"
+#: src/gui/setup_video.cpp:263
+msgid "Particle detail"
+msgstr "Détail des particules"
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
+#: src/gui/setup_video.cpp:264
+msgid "Font size"
+msgstr "Taille de police"
 
-#: ../src/commandhandler.cpp:241
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Si <channel> n'existe pas, il sera créé."
+#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:665
+msgid "None"
+msgstr "Rien"
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/gui/setup_video.cpp:428
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Si le <nick> contient des espaces, entourez le de guillemets (exemple : \"ni "
-"ck\")."
+"Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
+"également pas accessible !"
 
-#: ../src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
+#: src/gui/setup_video.cpp:434
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
-"Si tu n'étais pas autant en forme, tu serais en train de manger les "
-"pissenlits par la racine."
+"Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
+"également pas accessible !"
 
-#: ../src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
+#: src/gui/setup_video.cpp:445
+msgid "Switching to Full Screen"
+msgstr "Passage en plein écran"
+
+#: src/gui/setup_video.cpp:446
+msgid "Restart needed for changes to take effect."
 msgstr ""
-"Si vous étiez la dernière personne présente dans ce salon, il sera supprimé."
+"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: ../src/gui/popupmenu.cpp:108
-#, c-format
-msgid "Ignore %s"
-msgstr "Ignorer %s"
+#: src/gui/setup_video.cpp:460
+msgid "Changing to OpenGL"
+msgstr "Activation d'OpenGL"
 
-#: ../src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "Ignorer l'entrée 1"
+#: src/gui/setup_video.cpp:461
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+"Il est nécessaire de redémarrer le client pour appliquer les changements "
+"liés à OpenGL. Si OpenGL empêche un affichage correct, redémarrez le jeu "
+"avec l'option en ligne de commande : \"--no-opengl\"."
 
-#: ../src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "Ignorer l'entrée 2"
+#: src/gui/setup_video.cpp:468
+msgid "Deactivating OpenGL"
+msgstr "Désactiver OpenGL"
 
-#: ../src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Ignoré"
+#: src/gui/setup_video.cpp:469
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: ../src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorer les requêtes d'échanges entrantes"
+#: src/gui/setup_video.cpp:477
+msgid "Transparency disabled"
+msgstr "Transparence désactivée"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorer les demandes d'échanges."
+#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+msgid "You must restart to apply changes."
+msgstr "Vous devez redémarrer pour appliquer les changements."
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Informations"
+#: src/gui/setup_video.cpp:485
+msgid "Transparency enabled"
+msgstr "Transparence activée."
+
+#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+msgid "Screen Resolution Changed"
+msgstr "Résolution de l'écran modifiée"
 
-#: ../src/net/tmwa/playerhandler.cpp:109
+#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+msgid "Restart your client for the change to take effect."
+msgstr "Redémarrez le jeu pour que les changements soient appliqués."
+
+#: src/gui/setup_video.cpp:582
 #, fuzzy
-msgid "Insert coin to continue."
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"veuillez insérer une pièce pour continuer.\n"
+"Certaines fenêtre pourraient avoir été recentrée pour correspondre à la "
+"nouvelle résolution.\n"
 "#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Veuillez insérer une pièce pour continuer."
-
-#: ../src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "Pas assez de vie !"
-
-#: ../src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "PV insuffisant !"
-
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Intelligence"
-
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligence %+d"
-
-#: ../src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Intelligence :"
+"Certaines fenêtre pourraient avoir été recentrées pour correspondre à la "
+"nouvelle résolution."
 
-#: ../src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
-msgstr "Genre invalide."
+#: src/gui/setup_video.cpp:615
+msgid "Particle Effect Settings Changed."
+msgstr "Paramètres d'effet de particules modifiés."
 
-#: ../src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
-msgstr "Couleur de cheveux invalide."
+#: src/gui/setup_video.cpp:616
+msgid "Changes will take effect on map change."
+msgstr "Les changements seront appliqués au changement de carte."
 
-#: ../src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
-msgstr "Style de chevelure invalide."
+#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Compétences"
 
-#: ../src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
-msgstr "Nom invalide."
+#: src/gui/skilldialog.cpp:221
+msgid "Up"
+msgstr "Augmenter"
 
-#: ../src/client.cpp:1244
+#: src/gui/skilldialog.cpp:271
 #, c-format
-msgid "Invalid update host: %s"
-msgstr "Hôte de mise à jour incorrect : %s"
-
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inventaire"
-
-#: ../src/keyboardconfig.cpp:72
-msgid "Inventory Window"
-msgstr "Fenêtre de l'inventaire"
-
-#: ../src/localplayer.cpp:1254
-#, fuzzy
-msgid "Inventory is full."
-msgstr "Le serveur est plein"
+msgid "Skill points available: %d"
+msgstr "Points de compétences : %d"
 
-#: ../src/gui/socialwindow.cpp:334
-msgid "Invite"
-msgstr "Inviter"
+#: src/gui/skilldialog.cpp:353
+#, c-format
+msgid "Skill Set %d"
+msgstr "Compétences : %d"
 
-#: ../src/gui/popupmenu.cpp:130
+#: src/gui/skilldialog.cpp:362
 #, c-format
-msgid "Invite %s to join your guild"
-msgstr "Inviter %s à rejoindre votre guilde"
+msgid "Skill %d"
+msgstr "Compétence %d"
 
-#: ../src/gui/popupmenu.cpp:134
+#: src/gui/skilldialog.cpp:444
 #, c-format
-msgid "Invite %s to join your party"
-msgstr "Inviter %s à se joindre votre groupe"
+msgid "Lvl: %d (%+d)"
+msgstr "Niveau : %d (%+d)"
 
-#: ../src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Invitation envoyée."
+#: src/gui/skilldialog.cpp:455
+#, c-format
+msgid "Lvl: %d"
+msgstr "Niveau : %d"
 
-#: ../src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:128
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Le joueur %s a été invité dans la guilde %s."
 
-#: ../src/net/tmwa/partyhandler.cpp:335
+#: src/gui/socialwindow.cpp:143
 #, c-format
-msgid "Invited user %s to party."
-msgstr "/party > Inviter l'utilisateur %s dans le groupe."
+msgid "Guild %s quit requested."
+msgstr "Demande pour quitter la guilde %s effectuée."
 
-#: ../src/net/tmwa/partyhandler.cpp:340
-#, fuzzy, c-format
-msgid "Inviting failed, because you can't see a player called %s."
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"L'invitation à échouée, le joueur %s n'est pas à portée de vue.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"L'invitation a échouée, le joueur %s n'est pas à portée de vue."
+#: src/gui/socialwindow.cpp:157
+msgid "Member Invite to Guild"
+msgstr "Inviter le membre de la guilde"
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
+#: src/gui/socialwindow.cpp:158
 #, c-format
-msgid "Item Shortcut %d"
-msgstr "Raccourci Objet %d"
-
-#: ../src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Fenêtre de raccourci objet"
-
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
-msgstr ""
-
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
-msgstr ""
-
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
-msgstr ""
-
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Partage d'objet desactivé."
-
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Partage d'objet activé."
-
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "Partage d'objet impossible."
-
-#: ../src/net/tmwa/gui/partytab.cpp:141
-msgid "Item sharing unknown."
-msgstr "Paramètre de partage d'objets inconnu."
-
-#: ../src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr "Habilité"
+msgid "Who would you like to invite to guild %s?"
+msgstr "Qui voudriez-vous inviter dans la guilde %s ?"
 
-#: ../src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Habilité :"
+#: src/gui/socialwindow.cpp:167
+msgid "Leave Guild?"
+msgstr "Quitter la guilde ?"
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
+#: src/gui/socialwindow.cpp:168
 #, c-format
-msgid "Job: %d"
-msgstr "Metier : %d"
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
 
-#: ../src/net/manaserv/partyhandler.cpp:88
-#, fuzzy
-msgid "Joined party."
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Groupe rejoind.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Groupe rejoint."
+#: src/gui/socialwindow.cpp:222
+#, c-format
+msgid "Party %s quit requested."
+msgstr "Vous avez demandé à quitter le groupe %s."
 
-#: ../src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: src/gui/socialwindow.cpp:236
+msgid "Member Invite to Party"
+msgstr "Inviter un joueur dans le groupe"
 
-#: ../src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Conflit(s) de touche détecté"
+#: src/gui/socialwindow.cpp:237
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr "Qui voudriez vous inviter dans le groupe %s ?"
 
-#: ../src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Clavier"
+#: src/gui/socialwindow.cpp:246
+msgid "Leave Party?"
+msgstr "Quitter le groupe ?"
 
-#: ../src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Impossible de sortir la personne !"
+#: src/gui/socialwindow.cpp:247
+#, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
 
-#: ../src/gui/popupmenu.cpp:163
-msgid "Kick monster"
-msgstr "Ejecter un monstre"
+#: src/gui/socialwindow.cpp:276
+msgid "Create Guild"
+msgstr "Créer une Guilde"
 
-#: ../src/gui/popupmenu.cpp:141
-msgid "Kick player"
-msgstr "Ejecter un joueur"
+#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+msgid "Create Party"
+msgstr "Créer un groupe"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Sortie de la personne effectuée avec succès !"
+#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr "Social"
 
-#: ../src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Grand"
+#: src/gui/socialwindow.cpp:334
+msgid "Invite"
+msgstr "Inviter"
 
-#: ../src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:335
 msgid "Leave"
 msgstr "Quitter"
 
-#: ../src/gui/socialwindow.cpp:167
-msgid "Leave Guild?"
-msgstr "Quitter la guilde ?"
-
-#: ../src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
-msgstr "Quitter le groupe ?"
+#: src/gui/socialwindow.cpp:447
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr "Invitation dans le groupe acceptée de la part de %s."
 
-#: ../src/gui/statuswindow.cpp:257
-msgid "Level"
-msgstr "Niveau"
+#: src/gui/socialwindow.cpp:453
+#, c-format
+msgid "Rejected party invite from %s."
+msgstr "Invitation dans le groupe de la part de %s refusée."
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/socialwindow.cpp:466
 #, c-format
-msgid "Level: %d"
-msgstr "Niveau : %d"
+msgid "Accepted guild invite from %s."
+msgstr "Invitation dans la guilde acceptée de la part de %s."
 
-#: ../src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr "Liste des canaux."
+#: src/gui/socialwindow.cpp:472
+#, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Invitation dans la guilde de la part de %s refusée."
 
-#: ../src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr "Coup critique"
+#: src/gui/socialwindow.cpp:501
+msgid "Creating guild failed, please choose a shorter name."
+msgstr "La création de la guilde à échoué, veuillez choisir un nom plus court."
 
-#: ../src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr "Votre personnage touche le monstre"
+#: src/gui/socialwindow.cpp:507
+#, c-format
+msgid "Creating guild called %s."
+msgstr "La guilde %s a été créée."
 
-#: ../src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr "Votre personnage manque son coup"
+#: src/gui/socialwindow.cpp:523
+msgid "Creating party failed, please choose a shorter name."
+msgstr "La création du groupe à échoué, veuillez choisir un nom plus court."
 
-#: ../src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
-msgstr "Loguer les conversations avec les PNJ"
+#: src/gui/socialwindow.cpp:529
+#, c-format
+msgid "Creating party called %s."
+msgstr "Le groupe %s a été créé."
 
-#: ../src/client.cpp:682
-msgid "Logging in"
-msgstr "Connexion"
+#: src/gui/socialwindow.cpp:543
+msgid "Guild Name"
+msgstr "Nom de la guilde"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
-msgid "Login"
-msgstr "Connexion"
+#: src/gui/socialwindow.cpp:544
+msgid "Choose your guild's name."
+msgstr "Choisissez le nom de la guilde."
 
-#: ../src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
+#: src/gui/socialwindow.cpp:556
+#, fuzzy
+msgid "Received guild request, but one already exists."
 msgstr ""
-"La tentative de connexion a été faite trop rapidement depuis la dernière "
-"tentative."
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà "
+"une autre.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà "
+"une."
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Il semble que l'on vous ait rendu votre tête."
+#: src/gui/socialwindow.cpp:561
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s vous a invité à rejoindre la guilde %s."
 
-#: ../src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Chance"
+#: src/gui/socialwindow.cpp:566
+msgid "Accept Guild Invite"
+msgstr "Accepter l'invitation dans cette guilde"
 
-#: ../src/net/tmwa/generalhandler.cpp:106
-#, c-format
-msgid "Luck %+d"
-msgstr "Chance %+d"
+#: src/gui/socialwindow.cpp:578
+msgid "Received party request, but one already exists."
+msgstr ""
+"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Chance :"
+#: src/gui/socialwindow.cpp:588
+msgid "You have been invited you to join a party."
+msgstr "Vous avez été invité à rejoindre un groupe."
 
-#: ../src/gui/skilldialog.cpp:455
+#: src/gui/socialwindow.cpp:592
 #, c-format
-msgid "Lvl: %d"
-msgstr "Niveau : %d"
+msgid "You have been invited to join the %s party."
+msgstr "Vous avez été invité à rejoindre le groupe %s."
 
-#: ../src/gui/skilldialog.cpp:444
+#: src/gui/socialwindow.cpp:600
 #, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Niveau : %d (%+d)"
-
-#: ../src/net/tmwa/generalhandler.cpp:226
-msgid "M.Attack"
-msgstr "Attaque M."
-
-#: ../src/net/tmwa/generalhandler.cpp:227
-msgid "M.Defense"
-msgstr "Défense M."
-
-#: ../src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr "PM"
+msgid "%s has invited you to join their party."
+msgstr "%s vous a invité à rejoindre son groupe."
 
-#: ../src/resources/itemdb.cpp:56
+#: src/gui/socialwindow.cpp:605
 #, c-format
-msgid "MP %+d"
-msgstr "PM %+d"
+msgid "%s has invited you to join the %s party."
+msgstr "%s vous a invité à rejoindre le groupe %s."
 
-#: ../src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "PM :"
+#: src/gui/socialwindow.cpp:613
+msgid "Accept Party Invite"
+msgstr "Accepter l'invitation pour ce groupe"
 
-#: ../src/net/tmwa/chathandler.cpp:190
-msgid "MVP player."
-msgstr "Joueur MVP"
+#: src/gui/socialwindow.cpp:624
+msgid "Cannot create party. You are already in a party"
+msgstr "Ne peut pas créer un groupe. Vous faites déjà partie d'un groupe."
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
-msgid "Male"
-msgstr "Masculin"
+#: src/gui/socialwindow.cpp:629
+msgid "Party Name"
+msgstr "Nom du groupe"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Plan"
+#: src/gui/socialwindow.cpp:630
+msgid "Choose your party's name."
+msgstr "Choisissez le nom du groupe."
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+msgid "Specials"
+msgstr "Cpt. spéciales"
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: src/gui/specialswindow.cpp:174
 #, c-format
-msgid "Map: %s"
-msgstr "Carte : %s"
+msgid "Specials Set %d"
+msgstr "Set de Cpt. spéciales %d"
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Max."
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr "Cpt. spéciale %d"
 
-#: ../src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Medium"
+#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#, c-format
+msgid "Level: %d"
+msgstr "Niveau : %d"
 
-#: ../src/gui/socialwindow.cpp:157
-msgid "Member Invite to Guild"
-msgstr "Inviter le membre de la guilde"
+#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#, c-format
+msgid "Money: %s"
+msgstr "Argent : %s"
 
-#: ../src/gui/socialwindow.cpp:236
-msgid "Member Invite to Party"
-msgstr "Inviter un joueur dans le groupe"
+#: src/gui/statuswindow.cpp:113
+msgid "HP:"
+msgstr "Vie :"
 
-#: ../src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "La promotion de ce membre a réussie."
+#: src/gui/statuswindow.cpp:118
+msgid "Exp:"
+msgstr "Exp :"
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Message"
+#: src/gui/statuswindow.cpp:123
+msgid "MP:"
+msgstr "PM :"
 
-#: ../src/commandhandler.cpp:480
-msgid "Message closes chat."
-msgstr "Ce message ferme la conversation."
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#, c-format
+msgid "Job: %d"
+msgstr "Metier : %d"
 
-#: ../src/commandhandler.cpp:493
-msgid "Message now closes chat."
-msgstr "Ce message ferme maintenant la conversation."
+#: src/gui/statuswindow.cpp:142
+msgid "Job:"
+msgstr "Habilité :"
 
-#: ../src/keyboardconfig.cpp:75
-#, fuzzy
-msgid "Minimap Window"
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Fenêtre du plan\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Fenêtre du miniplan"
+#: src/gui/statuswindow.cpp:203
+msgid "HP"
+msgstr "Vie"
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
-#, c-format
-msgid "Minimap: %s"
-msgstr "Plan : %s"
+#: src/gui/statuswindow.cpp:209
+msgid "MP"
+msgstr "PM"
 
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Coups manqués"
+#: src/gui/statuswindow.cpp:215
+msgid "Exp"
+msgstr "Exp"
 
-#: ../src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:224
 msgid "Money"
 msgstr "Argent"
 
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:234
+msgid "Job"
+msgstr "Habilité"
+
+#: src/gui/statuswindow.cpp:238
 #, c-format
-msgid "Money: %s"
-msgstr "Argent : %s"
+msgid "Character points: %d"
+msgstr "Points de personnage : %d"
 
-#: ../src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr "Le monstre touche le joueur"
+#: src/gui/statuswindow.cpp:244
+#, c-format
+msgid "Correction points: %d"
+msgstr "Points de correction : %d"
 
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Monstres"
+#: src/gui/statuswindow.cpp:257
+msgid "Level"
+msgstr "Niveau"
 
-#: ../src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Descendre"
+#: src/gui/trade.cpp:52
+msgid "Propose trade"
+msgstr "Proposer un troc"
 
-#: ../src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Aller à gauche"
+#: src/gui/trade.cpp:53
+msgid "Confirmed. Waiting..."
+msgstr "Confirmé. En attente..."
 
-#: ../src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Aller à droite"
+#: src/gui/trade.cpp:54
+msgid "Agree trade"
+msgstr "Accepter l'échange"
 
-#: ../src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Monter"
+#: src/gui/trade.cpp:55
+msgid "Agreed. Waiting..."
+msgstr "Accepté. En attente..."
 
-#: ../src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Volume de la musique"
+#: src/gui/trade.cpp:58
+msgid "Trade: You"
+msgstr "Échange : Vous"
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
+#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+msgid "Trade"
+msgstr "Échange"
+
+#: src/gui/trade.cpp:75
+msgid "Add"
+msgstr "Ajouter"
+
+#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
 #, c-format
-msgid "Music: %s"
-msgstr "Musique : %s"
+msgid "You get %s"
+msgstr "Vous recevez %s"
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "PNJ"
+#: src/gui/trade.cpp:98
+msgid "You give:"
+msgstr "Vous donnez :"
 
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "PNJs"
+#: src/gui/trade.cpp:102
+msgid "Change"
+msgstr "Changer"
 
-#: ../src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Nom"
+#: src/gui/trade.cpp:273
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
+"dans cette fenêtre."
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Nom :"
+#: src/gui/trade.cpp:316
+msgid "You don't have enough money."
+msgstr "Vous n'avez pas assez d'argent."
 
-#: ../src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:51
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: ../src/gui/ministatus.cpp:157
-msgid "Need"
-msgstr "Restant"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Mise à jour en cours..."
 
-#: ../src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Indiquez quel utilisateur sortir !"
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Connexion..."
 
-#: ../src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
-msgstr "Indiquez à quel utilisateur donner les droit d'opérateur !"
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Jouer"
 
-#: ../src/game.cpp:372
-msgid "Network Error"
-msgstr "Erreur Réseau"
+#: src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1 Le processus de mise à jour n'est pas achevé"
 
-#: ../src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutre"
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1 Il est fortement recommandé que"
 
-#: ../src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr "Nouvelle adresse email incorrecte."
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:421
+msgid "##1  you try again later."
+msgstr "##1 Essayez à nouveau plus tard"
 
-#: ../src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr "Nouveau mot de passe incorrect."
+#: src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Terminé"
 
-#: ../src/net/tmwa/loginhandler.cpp:92
-msgid "New password too short."
-msgstr "Le nouveau mot de passe est trop court."
+#: src/gui/userpalette.cpp:91
+msgid "Being"
+msgstr "Forme de vie"
 
-#: ../src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Suivant"
+#: src/gui/userpalette.cpp:92
+msgid "Other Players' Names"
+msgstr "Nom des autres joueurs"
 
-#: ../src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Onglet de la conversation suivante"
+#: src/gui/userpalette.cpp:93
+msgid "Own Name"
+msgstr "Mon nom"
 
-#: ../src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Non"
+#: src/gui/userpalette.cpp:94
+msgid "GM Names"
+msgstr "Nom des MJ"
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
-msgstr ""
+#: src/gui/userpalette.cpp:95
+msgid "NPCs"
+msgstr "PNJs"
 
-#: ../src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
-msgstr "Pas d'emplacement vide."
+#: src/gui/userpalette.cpp:96
+msgid "Monsters"
+msgstr "Monstres"
 
-#: ../src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Pas de serveur de jeu disponible."
+#: src/gui/userpalette.cpp:97
+msgid "Party Members"
+msgstr "Membres du groupe"
 
-#: ../src/net/tmwa/generalhandler.cpp:132
-msgid "No servers available."
-msgstr "Aucun serveur n'est disponible."
+#: src/gui/userpalette.cpp:98
+msgid "Guild Members"
+msgstr "Membres de la guilde"
 
-#: ../src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Pas de texte"
+#: src/gui/userpalette.cpp:99
+msgid "Particle Effects"
+msgstr "Effets de particules"
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Non, les  enfants. Ton personnage n'est pas vraiment mort... Il... enfin,.. "
-"il... est parti dans un monde meilleur."
+#: src/gui/userpalette.cpp:100
+msgid "Pickup Notification"
+msgstr "Information de récupération"
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
-msgid "None"
-msgstr "Rien"
+#: src/gui/userpalette.cpp:101
+msgid "Exp Notification"
+msgstr "Information d'expérience"
 
-#: ../src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Pas d'enregistrement en cours."
+#: src/gui/userpalette.cpp:103
+msgid "Other Player Hits Monster"
+msgstr "L'autre joueur touche le monstre"
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
-msgid "Not logged in."
-msgstr "Non connecté."
+#: src/gui/userpalette.cpp:104
+msgid "Monster Hits Player"
+msgstr "Le monstre touche le joueur"
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Rien à vendre."
+#: src/gui/userpalette.cpp:105
+msgid "Critical Hit"
+msgstr "Coup critique"
 
-#: ../src/gui/setup_audio.cpp:94
-msgid "Notice"
-msgstr "Message"
+#: src/gui/userpalette.cpp:107
+msgid "Local Player Hits Monster"
+msgstr "Votre personnage touche le monstre"
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
-msgid "OK"
-msgstr "Ok"
+#: src/gui/userpalette.cpp:109
+msgid "Local Player Critical Hit"
+msgstr "Coup critique"
 
-#: ../src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr "Ancienne adresse email incorrecte."
+#: src/gui/userpalette.cpp:111
+msgid "Local Player Miss"
+msgstr "Votre personnage manque son coup"
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
-msgid "Old password incorrect."
-msgstr "Ancien mot de passe incorrect."
+#: src/gui/userpalette.cpp:112
+msgid "Misses"
+msgstr "Coups manqués"
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr "L'une des statistiques est à zéro."
+#: src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Affiche la liste des utilisateurs de ce salon"
 
-#: ../src/net/tmwa/gamehandler.cpp:87
-#, c-format
-msgid "Online users: %d"
-msgstr "Joueurs en ligne : %d"
+#: src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Change le sujet du salon"
 
-#: ../src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "Ouvrir GL"
+#: src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Quitter un salon"
 
-#: ../src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
-"\", \"false\", \"1\", \"0\"."
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Faire de l'utilisateur un opérateur du salon"
 
-#: ../src/main.cpp:43
-msgid "Options:"
-msgstr "Options :"
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Sortir un utilisateur du salon"
 
-#: ../src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr "L'autre joueur touche le monstre"
+#: src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Commande : /users"
 
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Nom des autres joueurs"
+#: src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
-msgstr "Tenue : %d"
+#: src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Commande: /topic <message>"
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr "Tenues"
+#: src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Cette commande change le sujet du salon en <message>"
 
-#: ../src/keyboardconfig.cpp:82
-msgid "Outfits Window"
-msgstr "Fenêtre des tenues"
+#: src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Commande : /quit"
 
-#: ../src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr "Texte aérien"
+#: src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Cette commande quitte le salon."
 
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Mon nom"
+#: src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr ""
+"Si vous étiez la dernière personne présente dans ce salon, il sera supprimé."
 
-#: ../src/gui/setup_video.cpp:615
-msgid "Particle Effect Settings Changed."
-msgstr "Paramètres d'effet de particules modifiés."
+#: src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Commande : /op <nick>"
 
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Effets de particules"
+#: src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Cette commande donne les droit d'opérateur du salon à <nick>"
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
-#, c-format
-msgid "Particle count: %d"
-msgstr "Effets de particules : %d"
+#: src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
+msgstr ""
+"Seul les opérateurs du salon peuvent sortir des utilisateurs et donner les "
+"droit d'opérateur aux autres utilisateurs du salon."
 
-#: ../src/gui/setup_video.cpp:263
-msgid "Particle detail"
-msgstr "Détail des particules"
+#: src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Commande : /kick <nick>"
 
-#: ../src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
-msgstr "Détail des particules : %s"
+#: src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Cette commande sort <nick> du salon."
 
-#: ../src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Effets de particules"
+#: src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr "Indiquez à quel utilisateur donner les droit d'opérateur !"
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Groupe"
+#: src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Indiquez quel utilisateur sortir !"
+
+#: src/gui/widgets/chattab.cpp:120
+msgid "Global announcement:"
+msgstr "Annonce globale :"
 
-#: ../src/gui/socialwindow.cpp:222
+#: src/gui/widgets/chattab.cpp:126
 #, c-format
-msgid "Party %s quit requested."
-msgstr "Vous avez demandé à quitter le groupe %s."
+msgid "Global announcement from %s:"
+msgstr "Annonce globale de %s :"
 
-#: ../src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr "Membres du groupe"
+#: src/gui/widgets/chattab.cpp:152
+#, c-format
+msgid "%s whispers: %s"
+msgstr "Message privé de %s : %s"
 
-#: ../src/gui/socialwindow.cpp:629
-msgid "Party Name"
-msgstr "Nom du groupe"
+#: src/gui/widgets/whispertab.cpp:52
+msgid "Cannot send empty chat!"
+msgstr "Impossible d'envoyer une conversation vide !"
 
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Indiquez un nom de groupe."
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/ignore > Ignore the other player"
+msgstr "/ignore > Ignore l'autre joueur"
 
-#: ../src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Création du groupe réussie."
+#: src/gui/widgets/whispertab.cpp:72
+msgid "/unignore > Stop ignoring the other player"
+msgstr "/unignore > Cesse d'ignorer l'autre joueur"
 
-#: ../src/gui/beingpopup.cpp:76
-#, c-format
-msgid "Party: %s"
-msgstr "Groupe : %s"
+#: src/gui/widgets/whispertab.cpp:73
+msgid "/close > Close the whisper tab"
+msgstr "/close > Ferme l'onglet de conversation privée"
 
-#: ../src/client.cpp:885
-msgid "Password Change"
-msgstr "Changement de mot de passe"
+#: src/gui/widgets/whispertab.cpp:83
+msgid "Command: /close"
+msgstr "Commande : /close"
 
-#: ../src/client.cpp:886
-msgid "Password changed successfully!"
-msgstr "Le mot de passe a été changé avec succès !"
+#: src/gui/widgets/whispertab.cpp:84
+msgid "This command closes the current whisper tab."
+msgstr "Cette commande ferme l'onglet courant de conversation privée."
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Mot de passe :"
+#: src/gui/widgets/whispertab.cpp:88
+msgid "Command: /ignore"
+msgstr "Commande : /ignore"
 
-#: ../src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Les deux mots de passe sont différents"
+#: src/gui/widgets/whispertab.cpp:89
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+"Cette commande permet d'ignorer un joueur qu'il soit indiqué comme ami ou "
+"non."
 
-#: ../src/gui/popupmenu.cpp:188
-#, c-format
-msgid "Pick up %s"
-msgstr "Ramasser %s"
+#: src/gui/widgets/whispertab.cpp:95
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
-#: ../src/keyboardconfig.cpp:52
-msgid "Pickup"
-msgstr "Ramasser"
+#: src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Statut"
 
-#: ../src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "Information de récupération"
+#: src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Raccourcis"
 
-#: ../src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Jouer"
+#: src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr "Sélection du monde"
 
-#: ../src/commandhandler.cpp:545
-msgid "Player already ignored!"
-msgstr "Le joueur est déjà ignoré !"
+#: src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
+msgstr "Changer de Login"
 
-#: ../src/commandhandler.cpp:554
-msgid "Player could not be ignored!"
-msgstr "Le joueur n'a pas pu être ignoré !"
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr "Choix du monde"
 
-#: ../src/commandhandler.cpp:576
-msgid "Player could not be unignored!"
-msgstr "Le joueur n'a pas pu être à nouveau écouté !"
+#: src/keyboardconfig.cpp:40
+msgid "Move Up"
+msgstr "Monter"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-msgid "Player deleted."
-msgstr "Personnage effacé."
+#: src/keyboardconfig.cpp:41
+msgid "Move Down"
+msgstr "Descendre"
 
-#: ../src/commandhandler.cpp:574
-msgid "Player no longer ignored!"
-msgstr "Le joueur n'est plus ignoré !"
+#: src/keyboardconfig.cpp:42
+msgid "Move Left"
+msgstr "Aller à gauche"
 
-#: ../src/commandhandler.cpp:552
-msgid "Player successfully ignored!"
-msgstr "Le joueur est désormais ignoré !"
+#: src/keyboardconfig.cpp:43
+msgid "Move Right"
+msgstr "Aller à droite"
 
-#: ../src/commandhandler.cpp:569
-msgid "Player wasn't ignored!"
-msgstr "Le joueur n'était pas ignoré !"
+#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+msgid "Attack"
+msgstr "Attaquer"
 
-#: ../src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Joueurs"
+#: src/keyboardconfig.cpp:45
+msgid "Target & Attack"
+msgstr "Cibler et Attaquer"
 
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr "Joueurs dans ce canal :"
+#: src/keyboardconfig.cpp:46
+msgid "Smilie"
+msgstr "Smilie"
 
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Veuillez distribuer %d points"
+#: src/keyboardconfig.cpp:47
+msgid "Talk"
+msgstr "Parler"
 
-#: ../src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Veuillez retirer %d points"
+#: src/keyboardconfig.cpp:48
+msgid "Stop Attack"
+msgstr "Arrêter d'attaquer"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
-msgid "Please specify a name."
-msgstr "Veuillez indiquer un nom."
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
+msgstr "Cibler un monstre"
 
-#: ../src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Veuillez entrer l'adresse et le port du serveur."
+#: src/keyboardconfig.cpp:50
+msgid "Target NPC"
+msgstr "Cibler le PNJ"
 
-#: ../src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Le poison fut sans effet..."
+#: src/keyboardconfig.cpp:51
+msgid "Target Player"
+msgstr "Cibler le Joueur"
 
-#: ../src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Port :"
+#: src/keyboardconfig.cpp:52
+msgid "Pickup"
+msgstr "Ramasser"
 
-#: ../src/gui/serverdialog.cpp:452
-msgid "Preparing download"
-msgstr "Préparation du téléchargement"
+#: src/keyboardconfig.cpp:53
+msgid "Hide Windows"
+msgstr "Cacher les fenêtres"
 
-#: ../src/gui/chat.cpp:307
-#, c-format
-msgid "Present: %s; %d players are present."
-msgstr "Présents : %s ; %d joueurs sont présents."
+#: src/keyboardconfig.cpp:54
+msgid "Sit"
+msgstr "S'assoir"
 
-#: ../src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-" Cliquer sur OK pour ressusciter\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Cliquer sur OK pour ressusciter"
+#: src/keyboardconfig.cpp:55
+msgid "Screenshot"
+msgstr "Capture d'écran"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Presser le bouton pour démarrer la calibration"
+#: src/keyboardconfig.cpp:56
+msgid "Enable/Disable Trading"
+msgstr "Activer / Désactiver les échanges"
 
-#: ../src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "Onglet de la conversation précédente"
+#: src/keyboardconfig.cpp:57
+msgid "Find Path to Mouse"
+msgstr "Trouver le chemin vers la souris"
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
+#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
+#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
 #, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Prix : %s / Total : %s"
-
-#: ../src/playerrelations.cpp:326
-msgid "Print '...'"
-msgstr "Affiche '...'"
+msgid "Item Shortcut %d"
+msgstr "Raccourci Objet %d"
 
-#: ../src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Proposer un troc"
+#: src/keyboardconfig.cpp:70
+msgid "Help Window"
+msgstr "Fenêtre d'Aide"
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Impulsion"
+#: src/keyboardconfig.cpp:71
+msgid "Status Window"
+msgstr "Fenêtre d'état"
 
-#: ../src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr "Placer tous les messages privés dans des onglets"
+#: src/keyboardconfig.cpp:72
+msgid "Inventory Window"
+msgstr "Fenêtre de l'inventaire"
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Quitter"
+#: src/keyboardconfig.cpp:73
+msgid "Equipment Window"
+msgstr "Fenêtre d'équipements."
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Arc-en-ciel"
+#: src/keyboardconfig.cpp:74
+msgid "Skill Window"
+msgstr "Fenêtre de compétences"
 
-#: ../src/gui/socialwindow.cpp:556
+#: src/keyboardconfig.cpp:75
 #, fuzzy
-msgid "Received guild request, but one already exists."
+msgid "Minimap Window"
 msgstr ""
 "#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà "
-"une autre.\n"
+"Fenêtre du plan\n"
 "#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà "
-"une."
-
-#: ../src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr ""
-"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
-
-#: ../src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "En cours d'enregistrement..."
+"Fenêtre du miniplan"
 
-#: ../src/gui/setup_colors.cpp:108
-msgid "Red:"
-msgstr "Rouge : "
+#: src/keyboardconfig.cpp:76
+msgid "Chat Window"
+msgstr "Fenêtre de conversation"
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
-msgid "Register"
-msgstr "S'inscrire"
+#: src/keyboardconfig.cpp:77
+msgid "Item Shortcut Window"
+msgstr "Fenêtre de raccourci objet"
 
-#: ../src/gui/login.cpp:129
-msgid "Registration disabled"
-msgstr "Enregistrement désactivé"
+#: src/keyboardconfig.cpp:78
+msgid "Setup Window"
+msgstr "Fenêtre de configuration"
 
-#: ../src/net/tmwa/loginhandler.cpp:165
-msgid "Rejected from server."
-msgstr "Rejeté par le serveur."
+#: src/keyboardconfig.cpp:79
+msgid "Debug Window"
+msgstr "Fenêtre de debug"
 
-#: ../src/gui/socialwindow.cpp:472
-#, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Invitation dans la guilde de la part de %s refusée."
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr "Groupes et Guildes"
 
-#: ../src/gui/socialwindow.cpp:453
-#, c-format
-msgid "Rejected party invite from %s."
-msgstr "Invitation dans le groupe de la part de %s refusée."
+#: src/keyboardconfig.cpp:81
+msgid "Emote Shortcut Window"
+msgstr "Fenêtre de raccourcis d'emote"
 
-#: ../src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Relation"
+#: src/keyboardconfig.cpp:82
+msgid "Outfits Window"
+msgstr "Fenêtre des tenues"
 
-#: ../src/gui/login.cpp:60
-msgid "Remember username"
-msgstr "Se souvenir du nom d'utilisateur"
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr "Mettre la tenue"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Demande d'échange"
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr "Copier la tenue"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
-msgid "Request to quit denied!"
-msgstr "Requête de départ refusée !"
+#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Raccourci d'emote %d"
 
-#: ../src/client.cpp:774
-msgid "Requesting characters"
-msgstr "Téléchargement des personnnages"
+#: src/keyboardconfig.cpp:97
+msgid "Toggle Chat"
+msgstr "Activer / Désactiver la conversation"
 
-#: ../src/client.cpp:858
-msgid "Requesting registration details"
-msgstr "Demande des paramètres d'enregistrement"
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Up"
+msgstr "Défiler la conversation (haut)"
 
-#: ../src/commandhandler.cpp:436
-#, fuzzy, c-format
-msgid "Requesting to join channel %s."
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Il vous est demandé de rejoindre le chan %s.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Il vous est demandé de rejoindre le salon %s."
+#: src/keyboardconfig.cpp:99
+msgid "Scroll Chat Down"
+msgstr "Défiler la conversation (bas)"
 
-#: ../src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Réinitialiser"
+#: src/keyboardconfig.cpp:100
+msgid "Previous Chat Tab"
+msgstr "Onglet de la conversation précédente"
 
-#: ../src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Rétablir les fenêtres"
+#: src/keyboardconfig.cpp:101
+msgid "Next Chat Tab"
+msgstr "Onglet de la conversation suivante"
 
-#: ../src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr ""
-"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
+#: src/keyboardconfig.cpp:102
+msgid "Select OK"
+msgstr "Sélectionner OK"
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "Redémarrez le jeu pour que les changements soient appliqués."
+#: src/keyboardconfig.cpp:104
+msgid "Ignore input 1"
+msgstr "Ignorer l'entrée 1"
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Récupérer"
+#: src/keyboardconfig.cpp:105
+msgid "Ignore input 2"
+msgstr "Ignorer l'entrée 2"
 
-#: ../src/commandhandler.cpp:489
-msgid "Return now toggles chat."
-msgstr "La touche enter ferme la ligne d'entrée de la conversation."
+#: src/keyboardconfig.cpp:184
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une "
+"des touches ou attendez vous à un possible comportement étrange du jeu."
 
-#: ../src/commandhandler.cpp:480
-msgid "Return toggles chat."
-msgstr "La touche enter ferme maintenant la ligne d'entrée du chat."
+#: src/localplayer.cpp:1248
+msgid "Unable to pick up item."
+msgstr "Impossible de ramasser l'objet."
 
-#: ../src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Tourner le joystick"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:1257
+#, 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/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
+#: src/localplayer.cpp:1435
+msgid "Away"
+msgstr "Inactif"
 
-#: ../src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Impossible de sauvegarder la capture d'écran !"
+#: src/main.cpp:42
+msgid "mana [options] [mana-file]"
+msgstr "mana [options] [fichier-mana]"
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
-msgid "Screen Resolution Changed"
-msgstr "Résolution de l'écran modifiée"
+#: src/main.cpp:43
+msgid "Options:"
+msgstr "Options :"
 
-#: ../src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Capture d'écran"
+#: src/main.cpp:44
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version : Affiche la version"
 
-#: ../src/game.cpp:333
-msgid "Screenshot saved as "
-msgstr "Capture d'écran sauvegardée en tant que"
+#: src/main.cpp:45
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help : Montre cette rubrique d'aide"
 
-#: ../src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Défiler la conversation (bas)"
+#: src/main.cpp:46
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
 
-#: ../src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Défiler la conversation (haut)"
+#: src/main.cpp:47
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
 
-#: ../src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
+#: src/main.cpp:48
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password : Se connecter avec ce mot de passe"
 
-#: ../src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "Sélectionner OK"
+#: src/main.cpp:49
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character : Se connecter avec ce personnage"
 
-#: ../src/gui/worldselectdialog.cpp:71
-msgid "Select World"
-msgstr "Sélection du monde"
+#: src/main.cpp:50
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
 
-#: ../src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Choisissez le nombre d'objets à jeter."
+#: src/main.cpp:51
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port : Port de connexion au serveur"
 
-#: ../src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
-msgstr "Sélectionnez le nombre d'objet à reprendre"
+#: src/main.cpp:52
+msgid "     --update-host    : Use this update host"
+msgstr ""
+"     --update-host : Utilise cette URL pour les fichiers de mises à jour"
 
-#: ../src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Choisissez le nombre d'objets à déplacer."
+#: src/main.cpp:53
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+"  -D --default : Choisir le serveur de personnages et le personnage par "
+"défaut"
 
-#: ../src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Sélectionnez le nombre d'objets à stocker."
+#: src/main.cpp:55
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+"  -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
 
-#: ../src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Choisissez le nombre d'objets à troquer."
+#: src/main.cpp:56
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data : Répertoire des données du jeu à charger"
 
-#: ../src/net/manaserv/charhandler.cpp:205
-msgid "Selection out of range."
-msgstr "La sélection est invalide."
+#: src/main.cpp:57
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+"  -L --localdata-dir : Répertoire à utiliser comme répertoire principal"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Vendre"
+#: src/main.cpp:58
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
-#: ../src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Envoyer"
+#: src/main.cpp:60
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "     --no-opengl : Désactive l'OpenGL pour cette session"
 
-#: ../src/gui/serverdialog.cpp:211
-msgid "Server type:"
-msgstr "Type de Serveur :"
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+msgid "You are dead."
+msgstr "Vous êtes mort."
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Serveur :"
+#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Nous avons le regret de vous informer que votre personnage est mort sur le "
+"champ de bataille."
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Configuration"
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+msgid "You are not that alive anymore."
+msgstr "Vous n'êtes plus vraiment en vie."
 
-#: ../src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Fenêtre de configuration"
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Les mains gelées de la faucheuse viennent réclamer votre âme."
 
-#: ../src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Volume des effets sonores"
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+msgid "Game Over!"
+msgstr "Fin de la partie !"
 
-#: ../src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Magasin"
+#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Non, les  enfants. Ton personnage n'est pas vraiment mort... Il... enfin,.. "
+"il... est parti dans un monde meilleur."
 
-#: ../src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Raccourcis"
+#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Votre tentative de casser l'arme de votre ennemi en la frappant avec votre "
+"gorge a échoué."
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
-msgid "Show IP: Off"
-msgstr "Afficher l'IP : Désactivé"
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+msgid "I guess this did not run too well."
+msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
-msgid "Show IP: On"
-msgstr "Afficher l'IP : Activé"
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+msgid "Do you want your possessions identified?"
+msgstr "Voulez-vous que vos biens soient identifiés ?"
 
-#: ../src/gui/setup_video.cpp:254
-msgid "Show damage"
-msgstr "Afficher les dégâts"
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
 
-#: ../src/gui/setup_players.cpp:232
-msgid "Show gender"
-msgstr "Afficher le genre"
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+msgid "Annihilated."
+msgstr "Vaporisé."
 
-#: ../src/gui/setup_video.cpp:227
-msgid "Show own name"
-msgstr "Afficher son propre nom"
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+msgid "Looks like you got your head handed to you."
+msgstr "Il semble que l'on vous ait rendu votre tête."
 
-#: ../src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
-msgstr "Afficher les messages de ramassage"
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Vous avez encore échoué, jetez votre corps aux oubliettes et prenez en un "
+"autre."
 
-#: ../src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "S'assoir"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+" Cliquer sur OK pour ressusciter\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Cliquer sur OK pour ressusciter"
 
-#: ../src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Vous n'avez pas pu vous assoir !"
+#: src/net/manaserv/beinghandler.cpp:325
+msgid "You Died"
+msgstr "Vous êtes mort"
 
-#: ../src/gui/skilldialog.cpp:362
-#, c-format
-msgid "Skill %d"
-msgstr "Compétence %d"
+#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+msgid "Not logged in."
+msgstr "Non connecté."
 
-#: ../src/gui/skilldialog.cpp:353
-#, c-format
-msgid "Skill Set %d"
-msgstr "Compétences : %d"
+#: src/net/manaserv/charhandler.cpp:137
+msgid "No empty slot."
+msgstr "Pas d'emplacement vide."
 
-#: ../src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Fenêtre de compétences"
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid name."
+msgstr "Nom invalide."
 
-#: ../src/gui/skilldialog.cpp:271
-#, c-format
-msgid "Skill points available: %d"
-msgstr "Points de compétences : %d"
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Character's name already exists."
+msgstr "Ce personnage existe déjà."
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Compétences"
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid hairstyle."
+msgstr "Style de chevelure invalide."
 
-#: ../src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr "Cases :"
+#: src/net/manaserv/charhandler.cpp:149
+msgid "Invalid hair color."
+msgstr "Couleur de cheveux invalide."
 
-#: ../src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Petit"
+#: src/net/manaserv/charhandler.cpp:152
+msgid "Invalid gender."
+msgstr "Genre invalide."
 
-#: ../src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Smilie"
+#: src/net/manaserv/charhandler.cpp:155
+msgid "Character's stats are too high."
+msgstr "Les caractéristiques du personnage sont trop hautes."
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
-msgid "Social"
-msgstr "Social"
+#: src/net/manaserv/charhandler.cpp:158
+msgid "Character's stats are too low."
+msgstr "Les caractéristiques du personnage sont trop basses."
 
-#: ../src/keyboardconfig.cpp:80
-msgid "Social Window"
-msgstr "Groupes et Guildes"
+#: src/net/manaserv/charhandler.cpp:161
+msgid "One stat is zero."
+msgstr "L'une des statistiques est à zéro."
 
-#: ../src/gui/setup_video.cpp:582
-#, fuzzy
-msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Certaines fenêtre pourraient avoir été recentrée pour correspondre à la "
-"nouvelle résolution.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Certaines fenêtre pourraient avoir été recentrées pour correspondre à la "
-"nouvelle résolution."
+#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+msgid "Unknown error."
+msgstr "Erreur inconnue."
 
-#: ../src/net/tmwa/generalhandler.cpp:136
-msgid "Someone else is trying to use this account."
-msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
+#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+msgid "Info"
+msgstr "Informations"
 
-#: ../src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Son"
+#: src/net/manaserv/charhandler.cpp:193
+msgid "Player deleted."
+msgstr "Personnage effacé."
 
-#: ../src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr "Moteur de son"
+#: src/net/manaserv/charhandler.cpp:205
+msgid "Selection out of range."
+msgstr "La sélection est invalide."
 
-#: ../src/gui/specialswindow.cpp:191
+#: src/net/manaserv/charhandler.cpp:208
 #, c-format
-msgid "Special %d"
-msgstr "Cpt. spéciale %d"
+msgid "Unknown error (%d)."
+msgstr "Erreur inconnue (%d)."
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr "Cpt. spéciales"
+#: src/net/manaserv/charhandler.cpp:242
+msgid "No gameservers are available."
+msgstr "Pas de serveur de jeu disponible."
 
-#: ../src/gui/specialswindow.cpp:174
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
-msgid "Specials Set %d"
-msgstr "Set de Cpt. spéciales %d"
-
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Spectre"
-
-#: ../src/net/tmwa/generalhandler.cpp:142
-msgid "Speed hack detected."
-msgstr "Speed hack detecté."
-
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
-msgid "Split"
-msgstr "Partager"
-
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
-msgstr ""
+msgid "Topic: %s"
+msgstr "Sujet : %s"
 
-#: ../src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Début de l'enregistrement..."
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr "Joueurs dans ce canal :"
 
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Statique"
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr "Erreur lors de la tentative d'entrée dans le canal."
 
-#: ../src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Statut"
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr "Liste des canaux."
 
-#: ../src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Fenêtre d'état"
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr "Fin de la liste du canal."
 
-#: ../src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Stop"
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr "%s a rejoint le canal."
 
-#: ../src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Arrêter d'attaquer"
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr "%s a quitté le canal"
 
-#: ../src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Arrêter l'enregistrement"
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr "%s a activé le mode %s sur le joueur %s."
 
-#: ../src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Stockage"
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr "%s a éjecté %s."
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
-msgid "Store"
-msgstr "Entreposer"
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr "Événement inconnu dans le canal."
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Force"
+#: src/net/manaserv/guildhandler.cpp:81
+msgid "Guild created."
+msgstr "Guilde créée."
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Force %+d"
+#: src/net/manaserv/guildhandler.cpp:86
+msgid "Error creating guild."
+msgstr "Erreur lors de la création de la guilde."
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Force :"
+#: src/net/manaserv/guildhandler.cpp:96
+msgid "Invite sent."
+msgstr "Invitation envoyée."
 
-#: ../src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Soumettre"
+#: src/net/manaserv/guildhandler.cpp:203
+msgid "Member was promoted successfully."
+msgstr "La promotion de ce membre a réussie."
 
-#: ../src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr "Changer de login"
+#: src/net/manaserv/guildhandler.cpp:208
+msgid "Failed to promote member."
+msgstr "Echec lors de la promotion du membre"
 
-#: ../src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Changer de personnage"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr "Mauvais jeton de sécurité."
 
-#: ../src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Changer de serveur"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr "Déjà connecté."
 
-#: ../src/gui/setup_video.cpp:445
-msgid "Switching to Full Screen"
-msgstr "Passage en plein écran"
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr "Compte banni."
 
-#: ../src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Parler"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr "Nouveau mot de passe incorrect."
 
-#: ../src/gui/popupmenu.cpp:150
-#, c-format
-msgid "Talk to %s"
-msgstr "Parler à %s"
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr "Ancien mot de passe incorrect."
 
-#: ../src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Cibler et Attaquer"
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Compte non connecté. Identifiez-vous tout d'abord."
 
-#: ../src/keyboardconfig.cpp:49
-msgid "Target Monster"
-msgstr "Cibler un monstre"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr "Nouvelle adresse email incorrecte."
 
-#: ../src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "Cibler le PNJ"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr "Ancienne adresse email incorrecte."
 
-#: ../src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Cibler le Joueur"
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr "Cette adresse email existe déjà pour un autre compte."
 
-#: ../src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Texte"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+"L'enregistrement de comptes en utilisant le client n'est pas permis. "
+"Veuillez contacter l'administrateur du serveur."
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Merci pour votre achat."
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr "La version de votre client est trop ancienne."
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Merci pour votre vente."
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr "Mauvais nom d'utilisateur ou mot de passe."
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Les mains gelées de la faucheuse viennent réclamer votre âme."
+#: src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr "Compte banni"
 
-#: ../src/game.cpp:368
-msgid "The connection to the server was lost."
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
-"La connexion au serveur a été coupée, le programme va maintenant se fermer."
+"La tentative de connexion a été faite trop rapidement depuis la dernière "
+"tentative."
 
-#: ../src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
-msgstr "Les deux adresses email ne correspondent pas."
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr "Mauvais nom d'utilisateur, mot de passe ou adresse email."
 
-#: ../src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr "Cette adresse email existe déjà pour un autre compte."
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr "Ce nom d'utilisateur existe déjà."
 
-#: ../src/gui/changeemaildialog.cpp:127
-#, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "L'adresse email doit être longue d'au moins %d caractères."
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr "Cette adresse email existe déjà."
 
-#: ../src/gui/changeemaildialog.cpp:134
-#, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "L'adresse email ne doit pas être plus longue que %d caractères."
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+"Vous avez mis trop de temps pour répondre au Captcha ou votre réponse est "
+"incorrecte."
 
-#: ../src/gui/changepassworddialog.cpp:130
+#: src/net/manaserv/partyhandler.cpp:88
 #, fuzzy
-msgid "The new password entries mismatch."
+msgid "Joined party."
 msgstr ""
 "#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Les anciens mots de passe ne correspondent pas.\n"
+"Groupe rejoind.\n"
 "#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Les nouveaux mots de passe ne correspondent pas."
+"Groupe rejoint."
 
-#: ../src/gui/changepassworddialog.cpp:116
-#, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "Le mot de passe doit être long d'au moins %d caractères."
+#: src/net/manaserv/partyhandler.cpp:106
+#, fuzzy, c-format
+msgid "%s joined the party."
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"%s a rejoind le groupe.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"%s a rejoint le groupe."
 
-#: ../src/gui/changepassworddialog.cpp:123
+#: src/net/manaserv/partyhandler.cpp:123
 #, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "Le mot de passe ne doit pas être plus long que %d caractères."
+msgid "%s rejected your invite."
+msgstr "%s a refusé votre invitation."
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
-#, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "Le mot de passe doit faire au moins %d caractères."
+#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
+msgid "Strength"
+msgstr "Force"
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
 #, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "Le mot de passe doit faire moins de %d caractères."
+msgid "Strength %+d"
+msgstr "Force %+d"
 
-#: ../src/gui/register.cpp:166
-#, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
+#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
+msgid "Agility"
+msgstr "Agilité"
 
-#: ../src/gui/register.cpp:174
+#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
 #, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
-
-#: ../src/net/tmwa/generalhandler.cpp:139
-msgid "This account is already logged in."
-msgstr "Ce compte est déjà connecté."
-
-#: ../src/net/tmwa/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
-msgstr "Cette commande vous fait quitter la guilde actuelle."
-
-#: ../src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Cette commande vous fait quitter votre groupe actuel."
-
-#: ../src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr ""
-"Cette commande change les préférences du groupe sur le partage d'expérience."
-
-#: ../src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr "Cette commande change les préférences d'échange d'objet du groupe."
-
-#: ../src/commandhandler.cpp:275
-msgid "This command clears the away status and message."
-msgstr "Cette commande retire le statut absent."
+msgid "Agility %+d"
+msgstr "Agilité %+d"
 
-#: ../src/commandhandler.cpp:229
-msgid "This command clears the chat log of previous chat."
-msgstr ""
-"Cette commande vide l'historique de conversation de la conversation "
-"précédente."
+#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
+msgid "Dexterity"
+msgstr "Dextérité"
 
-#: ../src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "Cette commande ferme l'onglet courant de conversation privée."
+#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Dextérité %+d"
 
-#: ../src/commandhandler.cpp:280
-msgid "This command creates a new party called <name>."
-msgstr "Cette commande crée un nouveau groupe appelé <name>"
+#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
+msgid "Vitality"
+msgstr "Vitalité"
 
-#: ../src/commandhandler.cpp:210
-msgid "This command displays a list of all commands available."
-msgstr "Cette commande affiche une liste de toutes les commandes disponibles."
+#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Vitality %+d"
+msgstr "Vitalité %+d"
 
-#: ../src/commandhandler.cpp:213
-msgid "This command displays help on <command>."
-msgstr "Cette commande affiche une aide sur la commande <command>."
+#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
+msgid "Intelligence"
+msgstr "Intelligence"
 
-#: ../src/commandhandler.cpp:324
-msgid "This command displays the name of the current map."
-msgstr "Cette commande affiche le nom de la carte où vous vous trouvez."
+#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligence %+d"
 
-#: ../src/commandhandler.cpp:329
-msgid "This command displays the number of players currently online."
-msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
+#: src/net/manaserv/stats.cpp:116
+msgid "Willpower"
+msgstr "Volonté"
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr ""
-"Cette commande affiche les préférences actuelles du groupe sur le partage "
-"d'expérience."
+#: src/net/manaserv/stats.cpp:118
+#, c-format
+msgid "Willpower %+d"
+msgstr "Volonté %+d"
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr ""
-"Cette commande affiche les préférences actuelles du groupe sur le partage "
-"d'objet."
+#: src/net/manaserv/tradehandler.cpp:96
+msgid "Accepting incoming trade requests."
+msgstr "Accepter les demandes d'échanges."
 
-#: ../src/commandhandler.cpp:313
-msgid "This command displays the return toggle status."
-msgstr "Cette commande vous affiche le status du toggle courant."
+#: src/net/manaserv/tradehandler.cpp:98
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorer les demandes d'échanges."
 
-#: ../src/commandhandler.cpp:302
-msgid "This command finishes a recording session."
-msgstr "Cette commande termine une session d'enregistrement."
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+msgid "Request for Trade"
+msgstr "Demande d'échange"
 
-#: ../src/commandhandler.cpp:292
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"Cette commande récupère une liste de tous les joueurs présents et l'envoie "
-"dans le fichier d'enregistrement s'il est activé, ou dans l'enregistrement "
-"de la conversation."
+#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
 
-#: ../src/commandhandler.cpp:234
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Cette commande ignore le joueur qu'il soit indiqué comme ami ou non."
+#: src/net/manaserv/tradehandler.cpp:135
+#, c-format
+msgid "Trading with %s"
+msgstr "Echange avec %s"
 
-#: ../src/gui/widgets/whispertab.cpp:89
-msgid "This command ignores the other player regardless of current relations."
-msgstr ""
-"Cette commande permet d'ignorer un joueur qu'il soit indiqué comme ami ou "
-"non."
+#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Echange annulé."
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Cette commande invite <nick> à rejoindre votre groupe."
+#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Echange finalisé."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Cette commande invite <nick> à rejoindre votre groupe."
+#: src/net/tmwa/adminhandler.cpp:65
+msgid "Kick failed!"
+msgstr "Impossible de sortir la personne !"
 
-#: ../src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Cette commande quitte le salon."
+#: src/net/tmwa/adminhandler.cpp:67
+msgid "Kick succeeded!"
+msgstr "Sortie de la personne effectuée avec succès !"
 
-#: ../src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Cette commande donne les droit d'opérateur du salon à <nick>"
+#: src/net/tmwa/buysellhandler.cpp:110
+msgid "Nothing to sell."
+msgstr "Rien à vendre."
 
-#: ../src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Cette commande sort <nick> du salon."
+#: src/net/tmwa/buysellhandler.cpp:117
+msgid "Thanks for buying."
+msgstr "Merci pour votre achat."
 
-#: ../src/commandhandler.cpp:240
-msgid "This command makes you enter <channel>."
-msgstr "Cette commande vous fait rentrer dans le salon <channel>."
+#: src/net/tmwa/buysellhandler.cpp:124
+msgid "Unable to buy."
+msgstr "Impossible d'acheter."
 
-#: ../src/commandhandler.cpp:223
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Cette commande envoie le message <msg> à tous les joueurs en ligne."
+#: src/net/tmwa/buysellhandler.cpp:130
+msgid "Thanks for selling."
+msgstr "Merci pour votre vente."
 
-#: ../src/commandhandler.cpp:258
-msgid "This command sends the text <message> to <nick>."
-msgstr "Cette commande envoie le texte <message> au joueur <nick>"
+#: src/net/tmwa/buysellhandler.cpp:132
+msgid "Unable to sell."
+msgstr "Impossible de vendre."
 
-#: ../src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Cette commande change le sujet du salon en <message>"
+#: src/net/tmwa/charserverhandler.cpp:105
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
 
-#: ../src/commandhandler.cpp:307
+#: src/net/tmwa/charserverhandler.cpp:109
 #, fuzzy
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+msgid "Cannot use this ID."
 msgstr ""
 "#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Cette commande définie si la touche entrée doit fermer le fichier "
-"d'enregistrement de la conversation ou si celui-ci se fermera "
-"automatiquement.\n"
+"Impossible d'utiliser cet Id.\n"
 "#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Cette commande définit si la touche entrée doit fermer le fichier "
-"d'enregistrement de la conversation ou si celui-ci se fermera "
-"automatiquement."
-
-#: ../src/commandhandler.cpp:246
-msgid "This command shows a list of all channels."
-msgstr "Cette commande affiche une liste de tous les salons publics."
-
-#: ../src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
-
-#: ../src/commandhandler.cpp:299
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr ""
-"Cette commande active l'enregistrement de la conversation dans le fichier "
-"<filename>."
-
-#: ../src/commandhandler.cpp:318
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-"Cette commande fait cesser d'ignorer le joueur donné s'il l'était "
-"précédemment."
-
-#: ../src/gui/widgets/whispertab.cpp:95
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
-
-#: ../src/commandhandler.cpp:251
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Cette commande informe les autres joueurs que vous faites <msg>."
-
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-"Cette commande indique que vous n'êtes pas actif en indiquant la raison."
-
-#: ../src/commandhandler.cpp:266
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Cette commande essaye de créer une fenêtre de dialogue entre vous et <nick>"
-
-#: ../src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "Voilà à quoi ressemble cette couleur"
-
-#: ../src/net/tmwa/loginhandler.cpp:179
-msgid "This user name is already taken."
-msgstr "Ce nom d'utilisateur est déjà utilisé."
+"Impossible d'utiliser cette Id."
 
-#: ../src/gui/setup_video.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:112
 #, fuzzy
-msgid "Tiny"
+msgid "Unknown char-server failure."
 msgstr ""
 "#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"fin\n"
+"Erreur inconnue provenant du serveur de personnages\n"
 "#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Fin"
-
-#: ../src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "A :"
+"Erreur inconnue provenant du serveur de personnages."
 
-#: ../src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr "Activer / Désactiver la conversation"
+#: src/net/tmwa/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+"Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
+"utilisé."
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Sujet : %s"
+#: src/net/tmwa/charserverhandler.cpp:150
+msgid "Character deleted."
+msgstr "Personnage supprimé."
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Échange"
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Failed to delete character."
+msgstr "La suppresion du personnage n'a pu s\"effectuer."
 
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Echange annulé."
+#: src/net/tmwa/charserverhandler.cpp:259
+msgid "Strength:"
+msgstr "Force :"
 
-#: ../src/net/tmwa/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Echange annulé pour une raison inconnue."
+#: src/net/tmwa/charserverhandler.cpp:260
+msgid "Agility:"
+msgstr "Agilité :"
 
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Echange finalisé."
+#: src/net/tmwa/charserverhandler.cpp:261
+msgid "Vitality:"
+msgstr "Vitalité :"
 
-#: ../src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Echange non réalisé !"
+#: src/net/tmwa/charserverhandler.cpp:262
+msgid "Intelligence:"
+msgstr "Intelligence :"
 
-#: ../src/net/tmwa/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Echange avec %s annulé."
+#: src/net/tmwa/charserverhandler.cpp:263
+msgid "Dexterity:"
+msgstr "Dextérité :"
 
-#: ../src/gui/popupmenu.cpp:83
-#, c-format
-msgid "Trade with %s..."
-msgstr "Troquer avec %s..."
+#: src/net/tmwa/charserverhandler.cpp:264
+msgid "Luck:"
+msgstr "Chance :"
 
-#: ../src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Échange : Vous"
+#: src/net/tmwa/chathandler.cpp:80
+msgid "Whisper could not be sent, user is offline."
+msgstr ""
+"Le message privé n'a pu être envoyé, le destinataire n'est pas connecté."
 
-#: ../src/net/tmwa/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Echange : Vous et %s"
+#: src/net/tmwa/chathandler.cpp:84
+msgid "Whisper could not be sent, ignored by user."
+msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
 
-#: ../src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Echange impossible. Ce personnage n'existe pas."
+#: src/net/tmwa/chathandler.cpp:190
+msgid "MVP player."
+msgstr "Joueur MVP"
 
-#: ../src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "L'échange est impossible. Votre partenaire est trop éloigné."
+#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
+#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
+#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
+#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+msgid "Channels are not supported!"
+msgstr "Les salons ne sont pas gérés !"
 
-#: ../src/net/manaserv/tradehandler.cpp:135
+#: src/net/tmwa/gamehandler.cpp:87
 #, c-format
-msgid "Trading with %s"
-msgstr "Echange avec %s"
+msgid "Online users: %d"
+msgstr "Joueurs en ligne : %d"
 
-#: ../src/gui/setup_video.cpp:477
-msgid "Transparency disabled"
-msgstr "Transparence désactivée"
+#: src/net/tmwa/gamehandler.cpp:101
+msgid "Game"
+msgstr "Jeu"
 
-#: ../src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
-msgstr "Transparence activée."
+#: src/net/tmwa/gamehandler.cpp:101
+msgid "Request to quit denied!"
+msgstr "Requête de départ refusée !"
 
-#: ../src/localplayer.cpp:1251
-#, fuzzy
-msgid "Tried to pick up nonexistent item."
-msgstr "Impossible de ramasser l'objet."
+#: src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Luck %+d"
+msgstr "Chance %+d"
 
-#: ../src/commandhandler.cpp:335
-msgid "Type /help for a list of commands."
-msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
+#: src/net/tmwa/generalhandler.cpp:129
+msgid "Authentication failed."
+msgstr "Échec de l'authentification."
 
-#: ../src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
-msgstr "Entrer l'adresse email deux fois :"
+#: src/net/tmwa/generalhandler.cpp:132
+msgid "No servers available."
+msgstr "Aucun serveur n'est disponible."
 
-#: ../src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
-msgstr "Entrer le mot de passe deux fois :"
+#: src/net/tmwa/generalhandler.cpp:136
+msgid "Someone else is trying to use this account."
+msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
 
-#: ../src/gui/setup_colors.cpp:71
-msgid "Type:"
-msgstr "Type : "
+#: src/net/tmwa/generalhandler.cpp:139
+msgid "This account is already logged in."
+msgstr "Ce compte est déjà connecté."
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Impossible d'acheter."
+#: src/net/tmwa/generalhandler.cpp:142
+msgid "Speed hack detected."
+msgstr "Speed hack detecté."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
-msgid "Unable to equip."
-msgstr "Impossible d'équiper cet objet."
+#: src/net/tmwa/generalhandler.cpp:145
+msgid "Duplicated login."
+msgstr "Authentification déjà effectuée."
 
-#: ../src/net/tmwa/network.cpp:345
-msgid "Unable to resolve host \""
-msgstr "Impossible de résoudre le nom \""
+#: src/net/tmwa/generalhandler.cpp:148
+msgid "Unknown connection error."
+msgstr "Erreur de connexion inconnue."
 
-#: ../src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Impossible de vendre."
+#: src/net/tmwa/generalhandler.cpp:206
+msgid "Got disconnected from server!"
+msgstr "Vous avez été déconnecté du serveur !"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:418
-msgid "Unable to unequip."
-msgstr "Impossible de deséquiper cet objet."
+#: src/net/tmwa/generalhandler.cpp:222
+msgid "Luck"
+msgstr "Chance"
 
-#: ../src/gui/setup_keyboard.cpp:90
-msgid "Unassign"
-msgstr "Désassigner"
+#: src/net/tmwa/generalhandler.cpp:225
+msgid "Defense"
+msgstr "Défense"
 
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
-msgid "Unequip"
-msgstr "Retirer"
+#: src/net/tmwa/generalhandler.cpp:226
+msgid "M.Attack"
+msgstr "Attaque M."
 
-#: ../src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
-msgstr "Retirer d'abord l'équipement"
+#: src/net/tmwa/generalhandler.cpp:227
+msgid "M.Defense"
+msgstr "Défense M."
 
-#: ../src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "Echange non pris en compte."
+#: src/net/tmwa/generalhandler.cpp:228
+msgid "% Accuracy"
+msgstr "% Précision"
 
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
+#: src/net/tmwa/generalhandler.cpp:229
 #, c-format
-msgid "Unignore %s"
-msgstr "Cesser d'ignorer %s"
-
-#: ../src/net/net.cpp:145
-#, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Type inconnu d'objet"
-
-#: ../src/net/manaserv/chathandler.cpp:327
-msgid "Unknown channel event."
-msgstr "Événement inconnu dans le canal."
-
-#: ../src/net/tmwa/charserverhandler.cpp:112
-#, fuzzy
-msgid "Unknown char-server failure."
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Erreur inconnue provenant du serveur de personnages\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Erreur inconnue provenant du serveur de personnages."
-
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
-msgid "Unknown command."
-msgstr "Commande inconnue."
-
-#: ../src/net/tmwa/generalhandler.cpp:148
-msgid "Unknown connection error."
-msgstr "Erreur de connexion inconnue."
+msgid "% Evade"
+msgstr "% Esquive"
 
-#: ../src/net/manaserv/charhandler.cpp:208
+#: src/net/tmwa/generalhandler.cpp:230
 #, c-format
-msgid "Unknown error (%d)."
-msgstr "Erreur inconnue (%d)."
-
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
-msgid "Unknown error."
-msgstr "Erreur inconnue."
+msgid "% Critical"
+msgstr "% Coup critique"
 
-#: ../src/net/tmwa/guildhandler.cpp:315
-msgid "Unknown guild invite response."
-msgstr "Réponse d'invitation à la guilde inconnue."
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Guilde"
 
-#: ../src/net/tmwa/partyhandler.cpp:133
-#, c-format
-msgid "Unknown invite response for %s."
-msgstr "Réponse d'invitation de %s inconnue."
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Affiche cette aide."
 
-#: ../src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Objet inconnu"
+#: src/net/tmwa/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invite un joueur à rejoindre votre guilde"
 
-#: ../src/localplayer.cpp:1258
-#, fuzzy
-msgid "Unknown problem picking up item."
-msgstr "Impossible de ramasser l'objet."
+#: src/net/tmwa/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Quitter la guilde courante"
 
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Se désinscrire"
+#: src/net/tmwa/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Ejecter quelqu'un du groupe dont vous faites partie"
 
-#: ../src/client.cpp:926
-msgid "Unregister Successful"
-msgstr "Désincription réussie"
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Commande : /invite <nick>"
 
-#: ../src/net/tmwa/loginhandler.cpp:156
-msgid "Unregistered ID."
-msgstr "Id non enregistrée."
+#: src/net/tmwa/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Cette commande invite <nick> à rejoindre votre groupe."
 
-#: ../src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Augmenter"
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Commande : /leave"
 
-#: ../src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Mise à jour en cours..."
+#: src/net/tmwa/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr "Cette commande vous fait quitter la guilde actuelle."
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
-msgid "Use"
-msgstr "Utiliser"
+#: src/net/tmwa/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr "Le nom de la guilde est manquant."
 
-#: ../src/net/tmwa/guildhandler.cpp:305
-msgid "User is now part of your guild."
-msgstr "%s est maintenant membre de la guilde."
+#: src/net/tmwa/guildhandler.cpp:295
+msgid "Could not inivte user to guild."
+msgstr "N'a pas pu inviter le joueur dans la guilde. "
 
-#: ../src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:300
 msgid "User rejected guild invite."
 msgstr "Le joueur a refusé l'invitation dans la guilde."
 
-#: ../src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr "Ce nom d'utilisateur existe déjà."
-
-#: ../src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Vidéo"
-
-#: ../src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Afficher les noms"
-
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Vitalité"
+#: src/net/tmwa/guildhandler.cpp:305
+msgid "User is now part of your guild."
+msgstr "%s est maintenant membre de la guilde."
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr "Vitalité %+d"
+#: src/net/tmwa/guildhandler.cpp:310
+msgid "Your guild is full."
+msgstr "Votre guilde est complète."
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Vitalité :"
+#: src/net/tmwa/guildhandler.cpp:315
+msgid "Unknown guild invite response."
+msgstr "Réponse d'invitation à la guilde inconnue."
 
-#: ../src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "Attente du serveur"
+#: src/net/tmwa/guildhandler.cpp:392
+msgid "Guild creation isn't supported yet."
+msgstr "La création de guilde n'est pas encore supportée."
 
-#: ../src/gui/serverdialog.cpp:448
-msgid "Waiting for server..."
-msgstr "En attente du serveur..."
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Groupe"
 
-#: ../src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "Enchainement échoué..."
+#: src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Invite un joueur à rejoindre votre groupe"
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"Nous avons le regret de vous informer que votre personnage est mort sur le "
-"champ de bataille."
+#: src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Quitte le groupe dans lequel vous vous trouvez"
 
-#: ../src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
-msgstr "Mettre la tenue"
+#: src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
 
-#: ../src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Poids :"
+#: src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Affiche / Modifie les préférences d'échange d'objet du groupe"
 
-#: ../src/gui/itempopup.cpp:126
-#, c-format
-msgid "Weight: %s"
-msgstr "Poids : %s"
+#: src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Affiche / Modifie les préférences d'expérience du groupe"
 
-#: ../src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "Quand ignoré :"
+#: src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Cette commande vous fait quitter votre groupe actuel."
 
-#: ../src/gui/popupmenu.cpp:91
-#, c-format
-msgid "Whisper %s"
-msgstr "Chuchoter à %s"
+#: src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Commande : /item <policy>"
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
+#: src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr "Cette commande change les préférences d'échange d'objet du groupe."
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"Le message privé n'a pu être envoyé, le destinataire n'est pas connecté."
+"<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange "
+"d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
 
-#: ../src/gui/chat.cpp:452
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Message privé envoyé à %s : %s"
+#: src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Commande : /item"
 
-#: ../src/gui/socialwindow.cpp:158
-#, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr "Qui voudriez-vous inviter dans la guilde %s ?"
+#: src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+"Cette commande affiche les préférences actuelles du groupe sur le partage "
+"d'objet."
 
-#: ../src/gui/socialwindow.cpp:237
-#, c-format
-msgid "Who would you like to invite to party %s?"
-msgstr "Qui voudriez vous inviter dans le groupe %s ?"
+#: src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Commande : /exp <policy>"
 
-#: ../src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr "Volonté"
+#: src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+"Cette commande change les préférences du groupe sur le partage d'expérience."
 
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "Volonté %+d"
+#: src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<préférences> peut être \"1\", \"yes\", \"true\" pour activer le partage "
+"d'expérience, ou \"0\", \"no\", \"false\" pour le désactiver."
 
-#: ../src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr "Mauvais jeton de sécurité."
+#: src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Commande : /exp"
 
-#: ../src/net/tmwa/loginhandler.cpp:159
-msgid "Wrong password."
-msgstr "Mauvais mot de passe."
+#: src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+"Cette commande affiche les préférences actuelles du groupe sur le partage "
+"d'expérience."
 
-#: ../src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr "Mauvais nom d'utilisateur ou mot de passe."
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+msgid "Item sharing enabled."
+msgstr "Partage d'objet activé."
 
-#: ../src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr "Mauvais nom d'utilisateur, mot de passe ou adresse email."
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+msgid "Item sharing disabled."
+msgstr "Partage d'objet desactivé."
 
-#: ../src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Oui"
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+msgid "Item sharing not possible."
+msgstr "Partage d'objet impossible."
 
-#: ../src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr "Vous êtes mort"
+#: src/net/tmwa/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr "Paramètre de partage d'objets inconnu."
 
-#: ../src/net/tmwa/playerhandler.cpp:139
-msgid "You are an ex-player."
-msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+msgid "Experience sharing enabled."
+msgstr "Partage d'expérience authorisé."
 
-#: ../src/net/tmwa/playerhandler.cpp:257
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
-"en mesure de regagner vos points de vie."
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+msgid "Experience sharing disabled."
+msgstr "Partage d'expérience non authorisé."
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Vous êtes mort."
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+msgid "Experience sharing not possible."
+msgstr "Partage d'expérience impossible."
 
-#: ../src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Vous n'existez plus."
+#: src/net/tmwa/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
+msgstr "Paramètre de partage d'expérience inconnu."
 
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Vous n'êtes plus vraiment en vie."
+#: src/net/tmwa/inventoryhandler.cpp:289
+msgid "Failed to use item."
+msgstr "Impossible d'utiliser l'objet."
 
-#: ../src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
-msgstr "Vous ne pouvez inviter que lorsque vous faites partie d'un groupe."
+#: src/net/tmwa/inventoryhandler.cpp:406
+msgid "Unable to equip."
+msgstr "Impossible d'équiper cet objet."
 
-#: ../src/net/tmwa/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "Vous ne pouvez faire cela maintenant !"
+#: src/net/tmwa/inventoryhandler.cpp:417
+msgid "Unable to unequip."
+msgstr "Impossible de deséquiper cet objet."
 
-#: ../src/net/tmwa/specialhandler.cpp:189
-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/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
 
-#: ../src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "Vous n'avez pas assez d'argent."
+#: src/net/tmwa/loginhandler.cpp:92
+msgid "New password too short."
+msgstr "Le nouveau mot de passe est trop court."
 
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
-#, c-format
-msgid "You get %s"
-msgstr "Vous recevez %s"
+#: src/net/tmwa/loginhandler.cpp:156
+msgid "Unregistered ID."
+msgstr "Id non enregistrée."
 
-#: ../src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "Vous donnez :"
+#: src/net/tmwa/loginhandler.cpp:159
+msgid "Wrong password."
+msgstr "Mauvais mot de passe."
 
-#: ../src/gui/socialwindow.cpp:592
-#, c-format
-msgid "You have been invited to join the %s party."
-msgstr "Vous avez été invité à rejoindre le groupe %s."
+#: src/net/tmwa/loginhandler.cpp:162
+msgid "Account expired."
+msgstr "Le compte a expiré."
 
-#: ../src/gui/socialwindow.cpp:588
-msgid "You have been invited you to join a party."
-msgstr "Vous avez été invité à rejoindre un groupe."
+#: src/net/tmwa/loginhandler.cpp:165
+msgid "Rejected from server."
+msgstr "Rejeté par le serveur."
 
-#: ../src/net/tmwa/loginhandler.cpp:168
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Vous avez été banni de façon permanente du jeu. Merci de vous mettre en "
 "contact avec l'équipe des GM."
 
-#: ../src/net/tmwa/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:172
 #, fuzzy, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -3610,11 +3388,51 @@ msgstr ""
 "Vous avez été banni temporairement du jeu depuis %s.\n"
 "Merci de contacter un GM par le forum."
 
-#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Vous avez cessez d'exister."
+#: src/net/tmwa/loginhandler.cpp:179
+msgid "This user name is already taken."
+msgstr "Ce nom d'utilisateur est déjà utilisé."
+
+#: src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr "Une adresse vide a été donnée à la commande Network::connect() !"
+
+#: src/net/tmwa/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr "Impossible de résoudre le nom \""
+
+#: src/net/tmwa/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr "Connexion au serveur terminée."
+
+#: src/net/tmwa/partyhandler.cpp:81
+msgid "Could not create party."
+msgstr "Le groupe n'a pu être créé."
+
+#: src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Création du groupe réussie."
+
+#: src/net/tmwa/partyhandler.cpp:121
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s est déjà membre du groupe."
+
+#: src/net/tmwa/partyhandler.cpp:125
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s a refusé votre invitation."
+
+#: src/net/tmwa/partyhandler.cpp:129
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s est maintenant membre de votre groupe."
 
-#: ../src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:133
+#, c-format
+msgid "Unknown invite response for %s."
+msgstr "Réponse d'invitation de %s inconnue."
+
+#: src/net/tmwa/partyhandler.cpp:241
 #, fuzzy
 msgid "You have left the party."
 msgstr ""
@@ -3623,97 +3441,91 @@ msgstr ""
 "#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Vous avez quitté le groupe."
 
-#: ../src/net/tmwa/specialhandler.cpp:180
-msgid "You have no memos!"
-msgstr "Vous n'avez pas de messages !"
+#: src/net/tmwa/partyhandler.cpp:252
+#, c-format
+msgid "%s has left your party."
+msgstr "%s a quitté le groupe."
 
-#: ../src/net/tmwa/specialhandler.cpp:171
-#, fuzzy
-msgid "You have not yet reached a high enough lvl!"
+#: src/net/tmwa/partyhandler.cpp:304
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Un membre inconnu a essayé de dire : %s"
+
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Invited user %s to party."
+msgstr "/party > Inviter l'utilisateur %s dans le groupe."
+
+#: src/net/tmwa/partyhandler.cpp:340
+#, fuzzy, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 "#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Vous n'avez pas encore atteind le niveau requis !\n"
+"L'invitation à échouée, le joueur %s n'est pas à portée de vue.\n"
 "#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Vous n'avez pas encore atteint le niveau requis !"
-
-#: ../src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
-"Le client devra être redémarré afin de vous permettre de télécharger la "
-"musique."
-
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
-msgstr "Vous devez redémarrer pour appliquer les changements."
+"L'invitation a échouée, le joueur %s n'est pas à portée de vue."
 
-#: ../src/net/tmwa/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
+#: src/net/tmwa/partyhandler.cpp:345
+msgid "You can only inivte when you are in a party!"
+msgstr "Vous ne pouvez inviter que lorsque vous faites partie d'un groupe."
 
-#: ../src/net/tmwa/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
+#: src/net/tmwa/partyhandler.cpp:374
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s n'est pas membre de votre groupe !"
 
-#: ../src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
+#: src/net/tmwa/playerhandler.cpp:109
+#, fuzzy
+msgid "Insert coin to continue."
 msgstr ""
-"Veuillez enregistrer votre compte sur la page du site prévue à cet effet."
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"veuillez insérer une pièce pour continuer.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Veuillez insérer une pièce pour continuer."
 
-#: ../src/localplayer.cpp:1276
-#, 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/net/tmwa/playerhandler.cpp:127
+msgid "You're not dead yet. You're just resting."
+msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement."
 
-#: ../src/net/tmwa/playerhandler.cpp:344
-#, c-format
-msgid "You picked up %s."
-msgstr "Vous avez ramassé  %s."
+#: src/net/tmwa/playerhandler.cpp:128
+msgid "You are no more."
+msgstr "Vous n'existez plus."
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Vous avez encore échoué, jetez votre corps aux oubliettes et prenez en un "
-"autre."
+#: src/net/tmwa/playerhandler.cpp:129
+msgid "You have ceased to be."
+msgstr "Vous avez cessez d'exister."
 
-#: ../src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-"Vous avez mis trop de temps pour répondre au Captcha ou votre réponse est "
-"incorrecte."
+#: src/net/tmwa/playerhandler.cpp:130
+msgid "You've expired and gone to meet your maker."
+msgstr "Tu es fini. Tu es parti retrouver ton créateur."
 
-#: ../src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're a stiff."
 msgstr "Tu es un dur."
 
-#: ../src/net/tmwa/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "Vous portez trop de choses pour pouvoir faire cela !"
+#: src/net/tmwa/playerhandler.cpp:132
+msgid "Bereft of life, you rest in peace."
+msgstr "Privé de toute essence de vie, vous reposez en paix."
 
-#: ../src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement."
+#: src/net/tmwa/playerhandler.cpp:133
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+"Si tu n'étais pas autant en forme, tu serais en train de manger les "
+"pissenlits par la racine."
 
-#: ../src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:134
+msgid "Your metabolic processes are now history."
+msgstr "Vos processus métaboliques appartiennent au passé maintenant."
+
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "You're off the twig."
 msgstr "Tu es en dehors des clous"
 
-#: ../src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr "Tu reposes au fond de l'eau."
-
-#: ../src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "Tu es fini. Tu es parti retrouver ton créateur."
-
-#: ../src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "You've kicked the bucket."
 msgstr "Tu viens de toucher le fond."
 
-#: ../src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:137
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -3721,467 +3533,580 @@ msgstr ""
 "Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint "
 "l'armée de l'ombre."
 
-#: ../src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
-msgstr "Votre guilde est complète."
+#: src/net/tmwa/playerhandler.cpp:139
+msgid "You are an ex-player."
+msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
 
-#: ../src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "Vos processus métaboliques appartiennent au passé maintenant."
+#: src/net/tmwa/playerhandler.cpp:140
+msgid "You're pining for the fjords."
+msgstr "Tu reposes au fond de l'eau."
 
-#: ../src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Votre nom doit comporter un minimum de 4 caractères."
+#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+msgid "Message"
+msgstr "Message"
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
+#: src/net/tmwa/playerhandler.cpp:257
 msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
-"Votre tentative de casser l'arme de votre ennemi en la frappant avec votre "
-"gorge a échoué."
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
+"en mesure de regagner vos points de vie."
 
-#: ../src/gui/setup_video.cpp:233
-msgid "as particle"
-msgstr "avec des particules"
+#: src/net/tmwa/playerhandler.cpp:344
+#, c-format
+msgid "You picked up %s."
+msgstr "Vous avez ramassé  %s."
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "élevé"
+#: src/net/tmwa/playerhandler.cpp:380
+msgid "Cannot raise skill!"
+msgstr "Ne peut pas augmenter la capacité !"
 
-#: ../src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "dans la conversation"
+#: src/net/tmwa/playerhandler.cpp:543
+msgid "Equip arrows first."
+msgstr "Equiper en premier les flèches"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "léger"
+#: src/net/tmwa/specialhandler.cpp:147
+msgid "Trade failed!"
+msgstr "Echange non réalisé !"
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr "mana [options] [fichier-mana]"
+#: src/net/tmwa/specialhandler.cpp:150
+msgid "Emote failed!"
+msgstr "Emote non realisé !"
 
-#: ../src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "max"
+#: src/net/tmwa/specialhandler.cpp:153
+msgid "Sit failed!"
+msgstr "Vous n'avez pas pu vous assoir !"
 
-#: ../src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "moyen"
+#: src/net/tmwa/specialhandler.cpp:156
+msgid "Chat creating failed!"
+msgstr "Vous n'avez pas pu créer la conversation !"
 
-#: ../src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "aucun"
+#: src/net/tmwa/specialhandler.cpp:159
+msgid "Could not join party!"
+msgstr "Vous n'avez pas pu rejoindre le groupe !"
 
-#: ../src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr "requiert une nouvelle version"
+#: src/net/tmwa/specialhandler.cpp:162
+msgid "Cannot shout!"
+msgstr "Vous ne pouvez pas crier !"
 
-#: ../src/gui/serverdialog.cpp:558
-#, c-format
-msgid "requires v%s"
-msgstr "requiert la v%s"
+#: src/net/tmwa/specialhandler.cpp:171
+#, fuzzy
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Vous n'avez pas encore atteind le niveau requis !\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Vous n'avez pas encore atteint le niveau requis !"
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
-msgid "unnamed"
-msgstr "anonyme"
+#: src/net/tmwa/specialhandler.cpp:174
+msgid "Insufficient HP!"
+msgstr "Pas assez de vie !"
 
-#~ msgid ""
-#~ "\n"
-#~ "> Cancel\n"
-#~ msgstr ""
-#~ "\n"
-#~ "> Annuler\n"
+#: src/net/tmwa/specialhandler.cpp:177
+msgid "Insufficient SP!"
+msgstr "PV insuffisant !"
 
-#~ msgid "  -D --default    : Bypass the login process with default settings"
-#~ msgstr ""
-#~ "  -D --default : Bypasser le processus de connexion par la configuration "
-#~ "par défaut"
+#: src/net/tmwa/specialhandler.cpp:180
+msgid "You have no memos!"
+msgstr "Vous n'avez pas de messages !"
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr ""
-#~ " ne peut pas être créé, mais il n'existe pourtant pas ! Fermeture du "
-#~ "programme."
+#: src/net/tmwa/specialhandler.cpp:183
+msgid "You cannot do that right now!"
+msgstr "Vous ne pouvez faire cela maintenant !"
 
-#~ msgid " cancelled"
-#~ msgstr " annulé"
+#: src/net/tmwa/specialhandler.cpp:186
+msgid "Seems you need more money... ;-)"
+msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
 
-#~ msgid " host: "
-#~ msgstr " hôte : "
+#: src/net/tmwa/specialhandler.cpp:189
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Vous ne pouvez utiliser ce pouvoir avec ce type d'arme !"
 
-#~ msgid " video mode: "
-#~ msgstr " mode d'affichage "
+#: src/net/tmwa/specialhandler.cpp:192
+msgid "You need another red gem!"
+msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Réflexe :"
+#: src/net/tmwa/specialhandler.cpp:195
+msgid "You need another blue gem!"
+msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
 
-#~ msgid "%s: %s"
-#~ msgstr "%s : %s"
+#: src/net/tmwa/specialhandler.cpp:198
+msgid "You're carrying to much to do this!"
+msgstr "Vous portez trop de choses pour pouvoir faire cela !"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Alias de création"
+#: src/net/tmwa/specialhandler.cpp:201
+msgid "Huh? What's that?"
+msgstr "Hé ? Qu'est-ce donc que cela ?"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 Barre de vie"
+#: src/net/tmwa/specialhandler.cpp:210
+msgid "Warp failed..."
+msgstr "Enchainement échoué..."
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 Barre de vie"
+#: src/net/tmwa/specialhandler.cpp:213
+msgid "Could not steal anything..."
+msgstr "Vous n'avez rien pu voler..."
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Armes à deux mains"
+#: src/net/tmwa/specialhandler.cpp:216
+msgid "Poison had no effect..."
+msgstr "Le poison fut sans effet..."
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 Barre de vie"
+#: src/net/tmwa/tradehandler.cpp:124
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "L'échange est impossible. Votre partenaire est trop éloigné."
 
-#~ msgid "; "
-#~ msgstr "; "
+#: src/net/tmwa/tradehandler.cpp:128
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Echange impossible. Ce personnage n'existe pas."
 
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Kick player@@"
+#: src/net/tmwa/tradehandler.cpp:132
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Echange annulé pour une raison inconnue."
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Attaquer %s@@"
+#: src/net/tmwa/tradehandler.cpp:137
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Echange : Vous et %s"
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Annuler@@"
+#: src/net/tmwa/tradehandler.cpp:144
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Echange avec %s annulé."
 
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|Négliger%s@@"
+#: src/net/tmwa/tradehandler.cpp:153
+msgid "Unhandled trade cancel packet."
+msgstr "Echange non pris en compte."
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Jeter@@"
+#: src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+"Impossible de rajouter un objet. Votre partenaire pour cet échange est "
+"surchargé."
 
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|Ignorer %s@@"
+#: src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+"Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus "
+"de place libre."
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Ramasser %s@@"
+#: src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Impossible de rajouter un objet pour une raison inconnue."
 
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|Ramasser %s@@"
+#: src/playerrelations.cpp:312
+msgid "Completely ignore"
+msgstr "Ignorer complètement"
 
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|Retirer@@"
+#: src/playerrelations.cpp:326
+msgid "Print '...'"
+msgstr "Affiche '...'"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Partager@@"
+#: src/playerrelations.cpp:342
+msgid "Blink name"
+msgstr "Fais clignoter le nom"
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Magasin@@"
+#: src/playerrelations.cpp:379
+msgid "Floating '...' bubble"
+msgstr "Bulle flottante '...'"
 
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Troquer avec %s@@"
+#: src/playerrelations.cpp:382
+msgid "Floating bubble"
+msgstr "Bulle flottante"
 
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Ne plus ignorer %s@@"
+#: src/resources/itemdb.cpp:53
+#, c-format
+msgid "Attack %+d"
+msgstr "Attaque %+d"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Équiper@@"
+#: src/resources/itemdb.cpp:54
+#, c-format
+msgid "Defense %+d"
+msgstr "Défense %+d"
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Déséquiper@@"
+#: src/resources/itemdb.cpp:55
+#, c-format
+msgid "HP %+d"
+msgstr "PV %+d"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Utiliser@@"
+#: src/resources/itemdb.cpp:56
+#, c-format
+msgid "MP %+d"
+msgstr "PM %+d"
+
+#: src/resources/itemdb.cpp:117
+msgid "Unknown item"
+msgstr "Objet inconnu"
+
+#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
+#: src/resources/monsterinfo.cpp:29
+msgid "unnamed"
+msgstr "anonyme"
 
 #, fuzzy
 #~ msgid "Access denied."
 #~ msgstr "Accès refusé"
 
-#~ msgid "Ammo"
-#~ msgstr "Munitions"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Problème inconnu lors de la séléction du personnage"
 
-#~ msgid "Arms"
-#~ msgstr "Bras"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Cette manière d'inviter n'est pas en place actuellement."
 
-#~ msgid "Attack:"
-#~ msgstr "Attaque :"
+#~ msgid "Willpower:"
+#~ msgstr "Volonté :"
 
-#~ msgid "Axe"
-#~ msgstr "Hache"
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "Le serveur est plein"
+
+#~ msgid "Text Shadow"
+#~ msgstr "Ombre du texte"
+
+#~ msgid "Text Outline"
+#~ msgstr "Bordure du texte"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Texte des barres de progression"
 
 #~ msgid "Background"
 #~ msgstr "Arrière-plan"
 
-#~ msgid "Bow"
-#~ msgstr "Arc"
+#~ msgid "Highlight"
+#~ msgstr "Surbrillance"
 
-#~ msgid "Buddy"
-#~ msgstr "Contact"
+#~ msgid "Tab Highlight"
+#~ msgstr "Onglet mis en surbrillance"
 
-#~ msgid "Buddy List"
-#~ msgstr "Liste de contacts"
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Objet trop cher"
 
-#~ msgid "Buddys"
-#~ msgstr "Contacts"
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "L'objet est équipé"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Jeter le sort d'essai 1"
+#~ msgid "GM"
+#~ msgstr "MJ"
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Jeter le sort d'essai 2"
+#~ msgid "Player"
+#~ msgstr "Joueur"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Jeter le sort d'essai 3"
+#~ msgid "Whisper"
+#~ msgstr "Message privé"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Commande : /new <party-name>"
+#~ msgid "Is"
+#~ msgstr "Est"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Connexion au serveur de comptes..."
+#~ msgid "Server"
+#~ msgstr "Serveur"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Connexion au serveur de personnages..."
+#~ msgid "Logger"
+#~ msgstr "Historique"
 
-#~ msgid "Cost"
-#~ msgstr "Coût"
+#~ msgid "Hyperlink"
+#~ msgstr "Lien"
 
-#~ msgid "Couldn't set "
-#~ msgstr "Impossibler d'assigner "
+#~ msgid "Unknown Item Type"
+#~ msgstr "Type inconnu d'objet"
 
-#~ msgid "Craft"
-#~ msgstr "Compétences"
+#~ msgid "Generics"
+#~ msgstr "Génériques"
 
-#~ msgid "Crafts"
-#~ msgstr "Metiers"
+#~ msgid "Hats"
+#~ msgstr "Chapeaux"
 
-#~ msgid "Description: %s"
-#~ msgstr "Description : %s"
+#~ msgid "Usables"
+#~ msgstr "Utilisables"
 
-#~ msgid "Effect: %s"
-#~ msgstr "Effet : %s"
+#~ msgid "Shirts"
+#~ msgstr "Chemises"
 
-#~ msgid "Emote"
-#~ msgstr "Emote"
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Armes à une main"
 
-#~ msgid "Emote Window"
-#~ msgstr "Fenêtre d'emote"
+#~ msgid "Pants"
+#~ msgstr "Pantalon"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Impossible de passer à "
+#~ msgid "Shoes"
+#~ msgstr "Chaussures"
 
-#~ msgid "GM"
-#~ msgstr "MJ"
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Armes à une main"
 
-#~ msgid "Generics"
-#~ msgstr "Génériques"
+#~ msgid "Shields"
+#~ msgstr "Boucliers"
 
-#~ msgid "Guilds"
-#~ msgstr "Guildes"
+#~ msgid "Rings"
+#~ msgstr "Anneaux"
+
+#~ msgid "Necklaces"
+#~ msgstr "Colliers"
+
+#~ msgid "Arms"
+#~ msgstr "Bras"
+
+#~ msgid "Ammo"
+#~ msgstr "Munitions"
 
 #~ msgid "HP Bar"
 #~ msgstr "Barre de vie (niveau maximum)"
 
-#~ msgid "Hats"
-#~ msgstr "Chapeaux"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 Barre de vie"
 
-#~ msgid "Highlight"
-#~ msgstr "Surbrillance"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 Barre de vie"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Lien"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 Barre de vie"
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Cette manière d'inviter n'est pas en place actuellement."
+#~ msgid "no"
+#~ msgstr "non"
 
-#~ msgid "Is"
-#~ msgstr "Est"
+#~ msgid "Buddy"
+#~ msgstr "Contact"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "L'objet est équipé"
+#~ msgid "Buddy List"
+#~ msgstr "Liste de contacts"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Objet trop cher"
+#~ msgid "Description: %s"
+#~ msgstr "Description : %s"
+
+#~ msgid "Effect: %s"
+#~ msgstr "Effet : %s"
+
+#~ msgid "Previous"
+#~ msgstr "Précédent"
+
+#~ msgid "New"
+#~ msgstr "Nouveau"
 
 #~ msgid "Job Level: %d"
 #~ msgstr "Niveau de Compétences : %d"
 
-#~ msgid "Knife"
-#~ msgstr "Couteau"
+#~ msgid "Present: "
+#~ msgstr "Présent : "
 
-#~ msgid "Logger"
-#~ msgstr "Historique"
+#~ msgid "Quit Guild"
+#~ msgstr "Quitter la guilde"
 
-#~ msgid "Mace"
-#~ msgstr "Masse"
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Recent:"
+#~ msgstr "Récent :"
 
 #~ msgid "Magic"
 #~ msgstr "Magie"
 
-#~ msgid "Max level"
-#~ msgstr "Niveau max."
-
-#~ msgid "Mystery Skill"
-#~ msgstr "Aptitude mystérieuse"
-
-#~ msgid "NPC Number Request"
-#~ msgstr "Requête de nombre PNJ"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Jeter le sort d'essai 1"
 
-#~ msgid "NPC Text Request"
-#~ msgstr "Requête de texte PNJ"
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Jeter le sort d'essai 2"
 
-#~ msgid "Necklaces"
-#~ msgstr "Colliers"
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Jeter le sort d'essai 3"
 
-#~ msgid "New"
-#~ msgstr "Nouveau"
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Armes à deux mains"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Troquer avec %s@@"
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Armes à une main"
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Attaquer %s@@"
 
-#~ msgid "Pants"
-#~ msgstr "Pantalon"
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Négliger%s@@"
 
-#~ msgid "Party Window"
-#~ msgstr "Fenêtre de groupe"
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignorer %s@@"
 
-#~ msgid "Player"
-#~ msgstr "Joueur"
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Ne plus ignorer %s@@"
 
-#~ msgid "Polearm"
-#~ msgstr "Pique"
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Kick player@@"
 
-#~ msgid "Present: "
-#~ msgstr "Présent : "
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Annuler@@"
 
-#~ msgid "Previous"
-#~ msgstr "Précédent"
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Ramasser %s@@"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Texte des barres de progression"
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Déséquiper@@"
 
-#~ msgid "Quit Guild"
-#~ msgstr "Quitter la guilde"
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Équiper@@"
 
-#~ msgid "Recent:"
-#~ msgstr "Récent :"
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Utiliser@@"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Point(s) de statut restant(s) : %d"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Jeter@@"
 
-#~ msgid "Rings"
-#~ msgstr "Anneaux"
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Partager@@"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Lenteur du défilement"
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Magasin@@"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Rayon du défilement"
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Retirer@@"
 
 #~ msgid "Select Server"
 #~ msgstr "Sélectionner un serveur"
 
-#~ msgid "Server"
-#~ msgstr "Serveur"
-
-#~ msgid "Shields"
-#~ msgstr "Boucliers"
+#~ msgid "Failed to switch to "
+#~ msgstr "Impossible de passer à "
 
-#~ msgid "Shirts"
-#~ msgstr "Chemises"
+#~ msgid "windowed"
+#~ msgstr "fenetré"
 
-#~ msgid "Shoes"
-#~ msgstr "Chaussures"
+#~ msgid "fullscreen"
+#~ msgstr "plein écran"
 
-#~ msgid "Shooting"
-#~ msgstr "Tirer"
+#~ msgid "Mystery Skill"
+#~ msgstr "Aptitude mystérieuse"
 
-#~ msgid "Slots: "
-#~ msgstr "Cases : "
+#~ msgid "Weapons"
+#~ msgstr "Armes"
 
-#~ msgid "Staff"
-#~ msgstr "Bâton"
+#~ msgid "Crafts"
+#~ msgstr "Metiers"
 
 #~ msgid "Stats"
 #~ msgstr "Statut"
 
-#~ msgid "Sword"
-#~ msgstr "Épée"
+#~ msgid "Total"
+#~ msgstr "Total"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Onglet mis en surbrillance"
+#~ msgid "Cost"
+#~ msgstr "Coût"
 
-#~ msgid "Text Outline"
-#~ msgstr "Bordure du texte"
+#~ msgid "Attack:"
+#~ msgstr "Attaque :"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Ombre du texte"
+#~ msgid "% Reflex:"
+#~ msgstr "% Réflexe :"
 
-#~ msgid "The Mana World %s"
-#~ msgstr "The Mana World %s"
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Point(s) de statut restant(s) : %d"
 
-#~ msgid "Thrown"
-#~ msgstr "Lancé"
+#~ msgid "Max level"
+#~ msgstr "Niveau max."
 
-#~ msgid "Total"
-#~ msgstr "Total"
+#~ msgid "curl error "
+#~ msgstr "Courbe d'erreur "
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Armes à une main"
+#~ msgid " host: "
+#~ msgstr " hôte : "
 
-#~ msgid "Unable to load selection.png"
-#~ msgstr "Impossible de charger le fichier selection.png"
+#~ msgid "Guilds"
+#~ msgstr "Guildes"
+
+#~ msgid "Buddys"
+#~ msgstr "Contacts"
+
+#~ msgid "Party Window"
+#~ msgstr "Fenêtre de groupe"
 
 #~ msgid "Unarmed"
 #~ msgstr "Désarmé"
 
+#~ msgid "Knife"
+#~ msgstr "Couteau"
+
+#~ msgid "Sword"
+#~ msgstr "Épée"
+
+#~ msgid "Polearm"
+#~ msgstr "Pique"
+
+#~ msgid "Staff"
+#~ msgstr "Bâton"
+
+#~ msgid "Whip"
+#~ msgstr "Fouet"
+
+#~ msgid "Bow"
+#~ msgstr "Arc"
+
+#~ msgid "Shooting"
+#~ msgstr "Tirer"
+
+#~ msgid "Mace"
+#~ msgstr "Masse"
+
+#~ msgid "Axe"
+#~ msgstr "Hache"
+
+#~ msgid "Thrown"
+#~ msgstr "Lancé"
+
+#~ msgid "Craft"
+#~ msgstr "Compétences"
+
 #~ msgid "Unknown Skill"
 #~ msgstr "Compétence inconnue"
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Problème inconnu lors de la séléction du personnage"
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr ""
+#~ " ne peut pas être créé, mais il n'existe pourtant pas ! Fermeture du "
+#~ "programme."
 
-#~ msgid "Unnamed"
-#~ msgstr "Aonyme"
+#~ msgid "Couldn't set "
+#~ msgstr "Impossibler d'assigner "
 
-#~ msgid "Usables"
-#~ msgstr "Utilisables"
+#~ msgid " video mode: "
+#~ msgstr " mode d'affichage "
 
-#~ msgid "Weapons"
-#~ msgstr "Armes"
+#~ msgid "mana"
+#~ msgstr "mana"
 
-#~ msgid "Whip"
-#~ msgstr "Fouet"
+#~ msgid "Connecting to character server..."
+#~ msgstr "Connexion au serveur de personnages..."
 
-#~ msgid "Whisper"
-#~ msgstr "Message privé"
+#~ msgid "Connecting to account server..."
+#~ msgstr "Connexion au serveur de comptes..."
 
-#~ msgid "Willpower:"
-#~ msgstr "Volonté :"
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Alias de création"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Commande : /new <party-name>"
 
 #~ msgid "a"
 #~ msgstr "un(e)"
 
-#~ msgid "curl error "
-#~ msgstr "Courbe d'erreur "
+#~ msgid "Unnamed"
+#~ msgstr "Aonyme"
 
-#~ msgid "fullscreen"
-#~ msgstr "plein écran"
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@pickup|Ramasser %s@@"
 
-#~ msgid "inc"
-#~ msgstr "inc"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "Impossible de charger le fichier selection.png"
 
-#~ msgid "items.xml"
-#~ msgstr "items.xml"
+#~ msgid "Emote"
+#~ msgstr "Emote"
 
-#~ msgid "mana"
-#~ msgstr "mana"
+#~ msgid "NPC Text Request"
+#~ msgstr "Requête de texte PNJ"
 
-#~ msgid "monsters.xml"
-#~ msgstr "monsters.xml"
+#~ msgid "NPC Number Request"
+#~ msgstr "Requête de nombre PNJ"
 
-#~ msgid "no"
-#~ msgstr "non"
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr ""
+#~ "\n"
+#~ "> Annuler\n"
 
 #~ msgid "skills.xml"
 #~ msgstr "skills.xml"
@@ -4189,5 +4114,40 @@ msgstr "anonyme"
 #~ msgid "use"
 #~ msgstr "Utiliser"
 
-#~ msgid "windowed"
-#~ msgstr "fenetré"
+#~ msgid "%s: %s"
+#~ msgstr "%s : %s"
+
+#~ msgid "Scroll radius"
+#~ msgstr "Rayon du défilement"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Lenteur du défilement"
+
+#~ msgid "Slots: "
+#~ msgstr "Cases : "
+
+#~ msgid "Emote Window"
+#~ msgstr "Fenêtre d'emote"
+
+#~ msgid "  -D --default    : Bypass the login process with default settings"
+#~ msgstr ""
+#~ "  -D --default : Bypasser le processus de connexion par la configuration "
+#~ "par défaut"
+
+#~ msgid " cancelled"
+#~ msgstr " annulé"
+
+#~ msgid "monsters.xml"
+#~ msgstr "monsters.xml"
+
+#~ msgid "items.xml"
+#~ msgstr "items.xml"
+
+#~ msgid "inc"
+#~ msgstr "inc"
+
+#~ msgid "; "
+#~ msgstr "; "
+
+#~ msgid "The Mana World %s"
+#~ msgstr "The Mana World %s"
diff --git a/po/he.po b/po/he.po
index f3a08efa..c4d183d8 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
-"PO-Revision-Date: 2010-12-06 19:34+0100\n"
-"Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
+"PO-Revision-Date: 2010-01-09 11:27+0000\n"
+"Last-Translator: hewhohasalongname <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
@@ -19,342 +19,321 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "הגדרות"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "מתחבר לשרת המפה..."
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "התחברות"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "בחר שחקן"
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "מתחבר לשרת המפה..."
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "שרת"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "שגי�ה"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "סיסמה:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "שנה"
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "החבר קוד� בהצלחה."
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "בטל רישו�"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "שרת עדכון פגו�: "
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "שגי�ה ביצירת ספריית העדכוני�!"
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "פקודה ל� מוכרת."
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- עזרה --"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "הצג תפריט עזרה זה <help/"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "הצג �ת ש� המפה <where/"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "הצג �ת כמות המשתמשי� המחוברי� <who/"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "ספר על עצמך <me/"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "נקה �ת החלון <clear/"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "שלח הודעה פרטית למשתמש < msg/"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "נמען ההודעה < whisper/"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "נמען ההודעה  <w/"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > יוצר לשונית עבור הודעות פרטיות ע� משתמש �חר"
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > ש� נוסף ל-query"
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > הצג �ת כל החדרי� הציבוריי�"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > צור �ו הצטרף לחדר"
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > צור חבורה חדשה"
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > הזמן משתמש לחבורה"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > התחל להקליט �ת השיחה לקובץ חיצוני"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > קובע �� <�נטר> סוגר �ת תיבת הטקסט של הצ'�ט"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > קבל �ת רשימת הנמצ�י� (ישלח לרישו�, �� פעיל)"
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > הודעה גלוב�לית (GM בלבד)"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "למידע נוסף, הקלד /help <command>."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "פקודה: /help"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "פקודה זו מציגה רשימה של כל הפקודות ה�פשריות."
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "פקודה: /help <command>"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "פקודה זו מציגה עזרה על <command>."
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "פקודה: /announce <msg>"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** זמין ל-GM בלבד ***"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
-msgstr "פקודה זו שולחת �ת ההודעה <msg> לכל השחקני� המחוברי�."
+msgstr ""
+"This command sends the message <msg> to all players currently online.\r\n"
+"פקודה זו שולחת �ת ההודעה <msg> לכל השחקני� המחוברי�."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "פקודה: /clear"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "פקודה זו מנקה �ת רישו� השיחה הקודמת."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "פקודה: /item <policy>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "פקודה זו מציגה �ת מספר השחקני� המחוברי� כרגע."
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "פקודה: /join <channel>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "פקודה זו מכניסה �ותך �ל <channel>."
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "�� <channel> �ינו קיי�, הו� נוצר."
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "פקודה: /list"
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "פקודה זו מציגה �ת רשימת כל החדרי�."
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "פקודה: /me <message>"
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "פקודה זו ת�מר ל�חרי� ש�תה (עושה) <msg>."
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "פקודה: /msg <nick> <message>"
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "פקודה: /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "פקודה: /w <nick> <message>"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "פקודה זו שולחת �ת הטקסט <message> �ל <nick>."
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "�� <nick> מכיל רווחי� בתוכו, תחו� �ותו במרכ�ות כפולות (\")."
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "פקודה: /query <nick>"
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "פקודה: /q <nick>"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "הפקודה מנסה ליצור לשונית עבור מסרי� בינך לבין <nick>."
 
-#: src/commandhandler.cpp:270
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "פקודה: /w <nick> <message>"
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-#, fuzzy
-msgid "Command: /away"
-msgstr "פקודה: /who"
-
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "פקודה זו מציבה �ת <message> ככותרת נוש� החדר."
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "פקודה: /create <party-name>"
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "פקודות �לה יוצרות חבורה בש� <party-name>."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "פקודה: /party <nick>"
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "פקודה זו מזמינה �ת <nick> להיות בחבורתך."
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "פקודה: /present"
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -362,27 +341,27 @@ msgstr ""
 "פקודה זו מקבלת �ת רשימת המשתמשי� המופיעי� על המסך, ושולח �ותה לרישו�, �� "
 "הינך מקליט רישו�, �ו �ל השיחה."
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "פקודה: /record <filename>"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "פקודה זו מתחילה להקליט רישו� שיחה לקובץ <filename>."
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "פקודה: /record"
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "פקודה זו מסיימת תהליך הקלטה."
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "פקודה: /toggle <state>"
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -390,7 +369,7 @@ msgstr ""
 "הפקודה קובעת �� מקש ה�נטר יסגור �ת תיבת הטקסט של הצ'�ט �ו שהו� ייסגר ב�ופן "
 "�וטומטי."
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -398,48 +377,48 @@ msgstr ""
 "<state> יכול להיות �חד משני משני מצבי�. \"1\", \"yes\", \"ture\" כדי לשנות "
 "למצב פעיל, �ו \"0\", no\", falst\" כדי לשנות למצב כבוי."
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "פקודה: /toggle"
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "הפקודה מציגה �ת מצב סגירת הטקסט ה�וטומטית."
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "פקודה: /item <policy>"
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "פקודה: /where"
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "פקודה זו מציגה �ת ש� המפה הנוכחית."
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "פקודה: /who"
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "פקודה זו מציגה �ת מספר השחקני� המחוברי� כרגע."
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "הקלד /help לרשימת הפקודות."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "ל� ניתן לשלוח לחישות ריקות!"
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -448,67 +427,67 @@ msgstr ""
 "ל� ניתן ליצור לשונית לחישות עבור הכינוי \"%s\"! הלשונית כבר קיימת �ו שמדובר "
 "בך."
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "מבקש להצטרף לחדר %s."
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "ש� חבורה חסר."
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "סגירת תיבת הטקסט ה�וטומטית."
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "ההודעה סוגרת �ת תיבת הטקסט."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "מקש ה�נטר כעת סוגר �ת תיבת הטקסט."
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "ההודעה כעת סוגרת �ת תיבת הטקסט."
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "חבורה נוצרה בהצלחה."
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "הלחישה ל� יכלה להשלח, מהמשתמש מתעל�."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "הלחישה ל� יכלה להשלח, מהמשתמש מתעל�."
@@ -519,42 +498,42 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "ה�פשרויות עבור /%s הינ� \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr "כללי"
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "תמונת־מסך נשמרה במיקו� ~/"
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "שמירת תמונת־מסך נכשלה"
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "החיבור לשרת נכשל, התוכנה תסגר כעת"
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "שגי�ת רשת"
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "מתעל� מהצעות סחר נכנסות"
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "מ�שר הצעות סחר נכנסות"
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "ל� ניתן לטעון �ת המפה"
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "שגי�ה בעת טעינת %s"
@@ -568,34 +547,34 @@ msgstr "חבורה (%s)"
 msgid "Buy"
 msgstr "קנה"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "מחיר: %s / סה\"כ: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "יצי�ה"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "מקסימו�"
 
@@ -609,11 +588,11 @@ msgstr "מכר"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "בטל"
@@ -689,14 +668,14 @@ msgstr "צור שחקן"
 msgid "Name:"
 msgstr "ש�:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -713,8 +692,8 @@ msgstr "צבע שיער:"
 msgid "Hair style:"
 msgstr "תיספורת:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "צור"
 
@@ -770,8 +749,8 @@ msgstr "בטל רישו�"
 msgid "Change Email"
 msgstr "שנה כתובת דו�ר �לקטרוני"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "מחק"
 
@@ -780,24 +759,24 @@ msgstr "מחק"
 msgid "Choose"
 msgstr "סגור"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "שיחה"
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d משתמשי� נוכחי�."
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "מקליט שמות נוכחי� לרישו�."
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "לוחש �ל %s: %s"
@@ -863,8 +842,8 @@ msgstr "�ופף FX"
 msgid "Equipment"
 msgstr "לבוש"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "הורד"
 
@@ -872,7 +851,7 @@ msgstr "הורד"
 msgid "Help"
 msgstr "עזרה"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "סגור"
 
@@ -884,81 +863,84 @@ msgstr "ציוד"
 msgid "Storage"
 msgstr "�יחסון"
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr "בשימוש:"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "השתמש"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "השתמש"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "השלך"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "פצל"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "משקל:"
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr "�חסן"
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr "החזר"
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "השלך"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "�ישור"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "הכל"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "בחר כמות חפצי� לסחור."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "בחר כמות חפצי� להשליך."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "בחר כמות חפצי� ל�חסן."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "בחר כמות חפצי� להחזיר."
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "בחר כמות חפצי� לפצל."
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "משקל: "
@@ -990,40 +972,40 @@ msgstr "שיתוף חפצי� מבוטל."
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "מפה"
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "ממתין לשרת"
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "הב�"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "שלח"
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "�פס"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1038,7 +1020,7 @@ msgstr "�ל:"
 msgid "Send"
 msgstr "שלח"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "נכשלה השליחה מכיוון והשולח �ו המכתב בעלי שגי�ה."
 
@@ -1128,7 +1110,7 @@ msgstr "@@name|הוסף ש� לשיחה@@"
 msgid "Pick up %s"
 msgstr "הר�"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|הוסף לשיחה@@"
@@ -1201,61 +1183,61 @@ msgstr "הסיסמה חייבת להכיל פחות מ-%d תוי�."
 msgid "Passwords do not match."
 msgstr "הסיסמ�ות �ינן תו�מות."
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "בחר �ת השרת שלך"
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "שרת:"
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "פורט:"
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "שרת:"
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "מתחבר..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "סמן-עכבר מות��"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "�נ� הכנס ג� �ת כתובת וג� �ת פורט השרת."
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "ממתין לשרת"
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1293,54 +1275,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "כך הצבע נר�ה"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "צבעי�"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "סוג: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "סטטי"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "פעימה"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "קשת בענן"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "מינסרה"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "עיכוב: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "�דו�: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "ירוק: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "כחול: "
@@ -1426,28 +1408,33 @@ msgstr "מתעל�"
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "�פשר מסחר"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "�פשר לחישות"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "הכנס �ת כל הלחישות ללשוניות"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "הצג ש�"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "ל� ניתן למכור."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "שחקני�"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "כ�שר מתעל�:"
 
@@ -1503,514 +1490,481 @@ msgstr "בינוני"
 msgid "max"
 msgstr "מקסימלי"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "מסך מל�"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "�OpenGL"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "סמן-עכבר מות��"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "שמות גלויי�"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "�פקטי� חלקיי�"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "הצג ש�"
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "הצג התרעת לקיחה"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "בשיחה"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "ב�ופן חלקי"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "הגבלת FPS:"
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "ויד�ו"
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 #, fuzzy
 msgid "Show damage"
 msgstr "הצג ש�"
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "טקסט מעל הר�ש"
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "�טימות Gui"
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "�ופף FX"
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "מידע חלקי"
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "גודל הגופן"
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "ל�"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "מצב ושיחזור מצב ישן נכשלו!"
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "מצב ושיחזור מצב ישן נכשלו!"
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "מחליף למסך מל�"
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "נדרש �יתחול כדי שהשינויי� יהיו ברי-תוקף."
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "משנה OpenGL"
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "�ישור שינויי� עבור OpenGL דורש �יתחול."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 #, fuzzy
 msgid "Transparency disabled"
 msgstr "שיתוף נסיון מבוטל."
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "רזולוצית המסך השתנתה"
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "טען מחדש כדי שהשינוי יחול."
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "הגדרות השינוי החלקי השתנו."
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "השינויי� יחולו על שינוי המפה."
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "כישורי�"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "למעלה"
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "נקודות כישורי�:  %d"
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "נקודות כישורי�:  %d"
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "כישורי�"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "רמה: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "רמה: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "גילדה נוצרה."
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "צור גילדה"
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "ה�� �תה בטוח שברצונך לצ�ת?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > הזמן משתמש לחבורה"
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > הזמן משתמש לחבורה"
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "ה�� �תה בטוח שברצונך לצ�ת?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "צור גילדה"
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "צור שחקן"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "הזמן משתמש"
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "גדול"
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "�שר �ת ההזמנה של %s."
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "דחה �ת ההזמנה של %s."
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "�שר �ת ההזמנה של %s."
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "דחה �ת ההזמנה של %s."
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "שגי�ה ביצירת גילדה."
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "גילדה"
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "בחר �ת השרת שלך"
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "התקבלה הזמנה לחבורה, �ך הזמנה זהה כבר קיימת."
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s הזמין �ותך להצטרף לחבורת %s."
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "�שר �ת הזמנת חבורה"
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "התקבלה הזמנה לחבורה, �ך הזמנה זהה כבר קיימת."
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s הזמין �ותך לחבורה שלה�."
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s הזמין �ותך להצטרף לחבורת %s."
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s הזמין �ותך לחבורה שלה�."
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s הזמין �ותך להצטרף לחבורת %s."
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "�שר �ת הזמנת חבורה"
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "חבורה"
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "בחר �ת השרת שלך"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "כסף: %s"
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "חיי�:"
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "נסיון:"
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "קס�:"
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "עבודה: %d"
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "עבודה:"
 
-#: src/gui/statuswindow.cpp:203
-#, fuzzy
-msgid "HP"
-msgstr "חיי�:"
-
-#: src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "קס�:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "נסיון:"
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "זהב: %d"
-
-#: src/gui/statuswindow.cpp:234
-#, fuzzy
-msgid "Job"
-msgstr "עבודה:"
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "נתוני שחקן - �ישור"
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "נקודות כישורי�:  %d"
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "רמה: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "מציע לחור"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "�ושר. ממתין..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "הסכ� למסחר"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "מוסכ�. ממתין..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "סחור: �תה"
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "סחרר"
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "הוסף"
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "�תה מקבל %s."
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "�תה נותן:"
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "שנה"
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "הוספת הפריט נכשלה. ל� ניתן להכניס מעל חפץ �חד לחלון."
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "�ין לך מספיק כסף."
 
@@ -2050,84 +2004,6 @@ msgstr "-"
 msgid "Completed"
 msgstr "הסתיי�"
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "× ×”×™×”"
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "שמות המשתמשי� ה�חרי�"
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "הש� שלך"
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "שמות המנהלי�"
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "דמויות"
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "מפלצות"
-
-#: src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "חבורה"
-
-#: src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "גילדה"
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "�פקטי� חלקיי�"
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "הודעה על לקיחה"
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "הודעה על נק' נסיון"
-
-#: src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "משתמש מכה מפלצת"
-
-#: src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "משתמש מכה משתמש"
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "מכה קריטית"
-
-#: src/gui/userpalette.cpp:107
-#, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "משתמש מכה מפלצת"
-
-#: src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "מכה קריטית"
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "פספוס"
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > רשימת המשתמשי� בחדר הנוכחי"
@@ -2204,55 +2080,55 @@ msgstr "צריך משתמש שינהל!"
 msgid "Need a user to kick!"
 msgstr "צריך משתמש שיעיף!"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "הודעה גלוב�לית:"
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "הודעה גלוב�לית מ�ת %s:"
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s: לוחש: "
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "ל� ניתן לשלוח הודעה ריקה!"
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > סוגר �ת לשונית הלחישות"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "פקודה: /close"
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "הפקודה סוגרת �ת לשונית הלחישות הנוכחית."
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "פקודה: /item"
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "פקודה זו מציגה �ת מספר השחקני� המחוברי� כרגע."
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "פקודה זו מתחילה להקליט רישו� שיחה לקובץ <filename>."
@@ -2280,412 +2156,426 @@ msgstr "שנה"
 msgid "Choose World"
 msgstr "בחר �ת השרת שלך"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "הזז למעלה"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "הזז למטה"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "הזז שמ�לה"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "הזז ימינה"
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "תקוף"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "כוון ותקוף"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "חייך"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "דבר"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "הפסק לתקוף"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "כוון לקרוב ביותר"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "כוון לדמות"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "כוון לשחקן"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "הר�"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "הסתר חלונות"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "שב"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "תמונת־מסך"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "�פשר/בטל מסחר"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "מצ� נתיב לעכבר"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "קיצור־דרך לחפץ %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "חלון עזרה"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "חלון מצב"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "חלון ציוד"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "חלון לבוש"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "חלון כישורי�"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "חלון מיני מפה"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "חלון שיחה"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "חלון קיצור־דרך לחפץ"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "חלון הגדרות"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "חלון ניפוי"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "חלון כישורי�"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "חלון קיצור־דרך לרגישון"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "חלון מצב"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "קיצור־דרך לריגשון %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "סגירת הצ'�ט"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "גלול שיחה למעלה"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "גלול שיחה למטה"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "לשונית השיחה הקודמת"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "לשונית השיחה הב�ה"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "בחר �ישור"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "קלט התעלמות 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "קלט התעלמות 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "פתור �ות�, �חרת המשחק עלול להתנהג ב�ופן מוזר."
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "ל� ניתן להרי� �ת החפץ."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "הרמת %s [@@%d|%s@@]."
 msgstr[1] "הרמת %s [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "�פשרויות:"
 
-#: src/main.cpp:44
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version     : Display the version"
 
-#: src/main.cpp:45
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help        : Display this help"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : Configuration file to use"
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username    : Login with this username"
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password    : Login with this password"
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character   : Login with this character"
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server      : Login server name or IP"
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port        : Login server port"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : Use this update host"
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default     : Choose default character server and character"
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Skip the update downloads"
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data        : Directory to load game data from"
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir    : Directory to use as home directory"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Configuration file to use"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir    : Directory to use as home directory"
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl   : Disable OpenGL for this session"
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr "�תה מת."
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "צר לנו לבשר לכ� כי שחקנכ� נהרג בקרב."
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr "�ינך חי כל־כך כרגע."
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "קור ידיו של המוות הקודר �וחזי� בנשמתך."
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr "המשחק נגמר!"
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "ל�, ילדי�. השחקן שלכ� ל� ב�מת מת. הו�... �ה... הלך למקו� טוב יותר."
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "תוכניתך לשבור �ת נשק ה�ויב ב�מצות צוו�רך נכשלה."
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr "�ני מניח של� הלך לך כל־כך טוב."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr "ה�� ברצונך שי�תרו �ת חלקי גופתך?"
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "ב�ופן מצער, מעול� ל� נמצ� זכר ממך..."
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr "הושמדתך."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr "נר�ה כ�ילו ר�שך נמסר �ליך."
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "פישלת שוב, גופתך תיזרק לצינוק ותקבל �חת חדשה."
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 #, fuzzy
 msgid "Press OK to respawn."
 msgstr " לחץ �ישור כדי להשיב"
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
 msgid "You Died"
 msgstr "נהרגת"
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Not logged in."
 msgstr "כבר מחובר"
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 #, fuzzy
 msgid "Character's name already exists."
 msgstr "ש� המשתמש כבר בשימוש"
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
 msgid "Character's stats are too high."
 msgstr "נתוני שחקן - �ישור"
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 #, fuzzy
 msgid "Character's stats are too low."
 msgstr "נתוני שחקן - �ישור"
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2693,96 +2583,96 @@ msgstr ""
 msgid "Unknown error."
 msgstr "שגי�ה ל� ידועה"
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr "מידע"
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 #, fuzzy
 msgid "Player deleted."
 msgstr "השחקן נמחק."
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "בחר כמות חפצי� לסחור."
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "שגי�ה ל� ידועה"
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr "�ין שרתי משחק זמיני�."
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr "כותרת: %s"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 #, fuzzy
 msgid "Players in this channel:"
 msgstr "משתמש מכה מפלצת"
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 #, fuzzy
 msgid "Error joining channel."
 msgstr "פקודה: /join <channel>"
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 #, fuzzy
 msgid "Listing channels."
 msgstr "מבקש להצטרף לחדר %s."
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, fuzzy, c-format
 msgid "%s entered the channel."
 msgstr "%s הצטרף לחבורה."
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "פקודה ל� מוכרת."
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr "גילדה נוצרה."
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr "שגי�ה ביצירת גילדה."
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr "הזמנה נשלחה."
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr "החבר קוד� בהצלחה."
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr "נכשל בקידו� החבר."
 
@@ -2873,11 +2763,11 @@ msgstr "כתובת הדו�\"ל כבר בשימוש"
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr "הצטרפת לחבורה."
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr "%s הצטרף לחבורה."
@@ -2887,190 +2777,137 @@ msgstr "%s הצטרף לחבורה."
 msgid "%s rejected your invite."
 msgstr "%s דחה �ת הזמנתך."
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "עוצמה"
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "עוצמה %+d"
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "זריזות"
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "זריזות %+d"
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "מיומנות"
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr "מיומנות %+d"
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "חיוניות"
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr "חיוניות %+d"
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "תבונה"
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr "תבונה %+d"
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "כח רצון:"
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "כח רצון %+d"
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr "מקבל בקשות מסחר נכנסות."
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr "מתעל� מבקשות סחר נכנסות."
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr "בקשה למסחר"
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s מעוניין לסחור עימך, ה�� �תה מסכי�?"
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr "סוחר ע�%s"
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr "המסחר בוטל."
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr "המסחר הושל�."
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "העפה נכשלה!"
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "העפה הצליחה!"
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "�ין מה למכור."
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "תודה על הקנייה."
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "ל� ניתן לקנות."
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "תודה על המכירה."
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "ל� ניתן למכור."
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "ל� ניתן להשתמש ב-ID זה."
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "שגי�ה ל� ידועה"
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "נכשל ביצירת השחקן. ייתכן כי ש� זה כבר תפוס."
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "השחקן נמחק."
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "נכשל במחיקת השחקן."
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "עוצמה:"
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "זריזות:"
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "חיוניות:"
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "תבונה:"
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "מיומנות:"
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "מזל:"
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "הלחישה ל� יכלה להשלח, המשתמש �ינו מחובר."
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "הלחישה ל� יכלה להשלח, מהמשתמש מתעל�."
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "שחקן"
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "חדרי� �ינ� נתמכי�!"
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -3085,80 +2922,125 @@ msgstr "ש�"
 msgid "Request to quit denied!"
 msgstr "בקשה למסחר"
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr "עוצמה %+d"
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr "זריזות %+d"
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr "חיוניות %+d"
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr "תבונה %+d"
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr "מיומנות %+d"
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr "מזל %+d"
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "ה�ימות נכשל"
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "�ין שרתי� זמיני�"
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "�ד� �חר מנסה להשתמש בחשבון זה"
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "חשבון זה כבר מחובר"
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "פריצת מהירות זוהתה"
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "התחברות כפולה"
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "שגי�ת חיבור ל� ידועה"
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "נותקת מהשרת!"
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "עוצמה"
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "זריזות"
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "חיוניות"
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "תבונה"
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "מיומנות"
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "מזל"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "×”×’× ×”:"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "התקפת קס�:"
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "הגנת קס�:"
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% דיוק:"
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% התחמקות:"
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "מכה קריטית"
@@ -3209,29 +3091,29 @@ msgstr "פקודה זו גורמת לשחקן לעזוב �ת החבורה."
 msgid "Guild name is missing."
 msgstr "ש� חבורה חסר."
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s הצטרף לחבורה."
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "תגובה ל� ידועה להזמנה עבור %s."
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3311,15 +3193,15 @@ msgstr "פקודה: /exp"
 msgid "This command displays the party's current experience sharing policy."
 msgstr "פקודה זו מציגה �ת מדיניות שיתוף הנסיון הנוכחית בחבורה."
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "שיתוף חפצי� מ�ופשר."
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "שיתוף חפצי� מבוטל."
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "שיתוף חפצי� ל� �פשרי."
 
@@ -3328,15 +3210,15 @@ msgstr "שיתוף חפצי� ל� �פשרי."
 msgid "Item sharing unknown."
 msgstr "שיתוף חפצי� מ�ופשר."
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "שיתוף נסיון מ�ופשר."
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "שיתוף נסיון מבוטל."
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "שיתוף נסיון ל� �פשרי."
 
@@ -3345,15 +3227,15 @@ msgstr "שיתוף נסיון ל� �פשרי."
 msgid "Experience sharing unknown."
 msgstr "שיתוף נסיון מ�ופשר."
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "נכשל בשימוש בחפץ."
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "ל� ניתן ללבוש."
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "ל� ניתן להסיר."
 
@@ -3420,7 +3302,7 @@ msgstr "ל� ניתן למכור."
 msgid "Connection to server terminated. "
 msgstr "מתחבר לשרת המפה..."
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "ל� היה ניתן ליצור חבורה."
 
@@ -3428,242 +3310,237 @@ msgstr "ל� היה ניתן ליצור חבורה."
 msgid "Party successfully created."
 msgstr "חבורה נוצרה בהצלחה."
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s כבר חבר בחבורה."
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s דחה �ת הזמנתך."
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s הצטרף לחבורה."
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "תגובה ל� ידועה להזמנה עבור %s."
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "עזבת �ת החבורה."
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s עזב �ת החבורה שלך."
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "משתמש ל� ידוע ניסה לומר: %s"
 
 #: src/net/tmwa/partyhandler.cpp:335
-#, fuzzy, c-format
-msgid "Invited user %s to party."
-msgstr "/party > הזמן משתמש לחבורה"
-
-#: src/net/tmwa/partyhandler.cpp:340
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s �ינו נמצ� בחבורתך!"
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "הכנס מטבע כדי להמשיך."
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "�ינך מת עדיין. �תה רק נח."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "�ינך יותר."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "חדלת מלהתקיי�."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "התפוגגת ועברת לפגוש �ת הבור�."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "�ינך מת עדיין. �תה רק נח."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "נטול חיי�, �ת נח על משכבך."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "�תה ל� מת עדיין! �ה.. טוב, עכשיו כן."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "חילוף החומרי� שלך הפך להיסטוריה."
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "�תה מכה כמו גופה."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "חדלת מלהתקיי�."
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "התפוגגת ועברת לפגוש �ת הבור�."
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "הינך שחקן לשעבר."
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "�תה מת. טוב שיש חברת ביטוח..."
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "הודעה"
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "�תה סוחב יותר מחצי ממשקלך. �ינך יכול ל�חות �ת החיי�."
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "הרמת "
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "הצטייד בחצי� תחילה."
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "המסחר נכשל!"
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "הבעה נכשלה!"
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "הישיבה נכשלה!"
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "יצירת שיחה נכשלה!"
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "ל� היה ניתן להצטרף לחגיגה!"
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "ל� ניתן לצעוק!"
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "ל� הגעת לרמה גבוהה מספיק!"
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "ל� נותרו נק' חיי�!"
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "ל� נותרו נק' קס�!"
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "�ין תזכירי�!"
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "�ינך יכול לעשות ז�ת כרגע!"
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "נר�ה ש�תה צריך עוד כסף... ;-)"
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "�ינך יכול להשתמש בכישור ע� נשק זה!"
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "�תה צריך עוד �בן �דומה!"
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "�תה צריך עוד �בן כחולה!"
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "�תה סוחב יותר מדי בכדי לעשות ז�ת!"
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "ה�? מה זה?"
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "הפיתול נכשל...."
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "ל� היה ניתן לגנוב דבר..."
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "לרעל ל� הייתה כל השפעה..."
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "מסחר �ינו �פשרי. השותף למסחר רחוק מדי."
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "מסחר �ינו �פשרי. השחקן �ינו קיי�."
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "המסחר בוטל מסיבה ל� ידועה."
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "מסחר: �תה ו-%s"
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "המסחר ע� %s בוטל."
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "המסחר נכשל"
 
@@ -3679,53 +3556,44 @@ msgstr "נכשל בהוספת חפץ. לשותף למסחר �ין מקומות
 msgid "Failed adding item for unknown reason."
 msgstr "נכשל בהוספת חפץ מסיבה ל� ידועה."
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 #, fuzzy
 msgid "Completely ignore"
 msgstr "@@ignore|התעל� לחלוטין %s@@"
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr "התקפה %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr "×”×’× ×” %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr "חיי� %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr "חפץ ל� ידוע"
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr "לל� ש�"
 
@@ -3776,6 +3644,24 @@ msgstr "לל� ש�"
 #~ msgid "Hyperlink"
 #~ msgstr "קישור"
 
+#~ msgid "Being"
+#~ msgstr "× ×”×™×”"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "שמות המשתמשי� ה�חרי�"
+
+#~ msgid "Own Name"
+#~ msgstr "הש� שלך"
+
+#~ msgid "GM Names"
+#~ msgstr "שמות המנהלי�"
+
+#~ msgid "NPCs"
+#~ msgstr "דמויות"
+
+#~ msgid "Monsters"
+#~ msgstr "מפלצות"
+
 #~ msgid "Unknown Item Type"
 #~ msgstr "סוג חפץ ל� ידוע"
 
@@ -3820,6 +3706,29 @@ msgstr "לל� ש�"
 #~ msgid "Ammo"
 #~ msgstr "תחמושת"
 
+#~ msgid "Particle Effects"
+#~ msgstr "�פקטי� חלקיי�"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "הודעה על לקיחה"
+
+#~ msgid "Exp Notification"
+#~ msgstr "הודעה על נק' נסיון"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "משתמש מכה מפלצת"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "משתמש מכה משתמש"
+
+#~ msgid "Critical Hit"
+#~ msgstr "מכה קריטית"
+
+#~ msgid "Misses"
+#~ msgstr "פספוס"
+
 #~ msgid "HP Bar"
 #~ msgstr "סרגל חיי�"
 
@@ -3833,6 +3742,30 @@ msgstr "לל� ש�"
 #~ msgstr "1/4 סרגל חיי�"
 
 #, fuzzy
+#~ msgid "HP"
+#~ msgstr "חיי�:"
+
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "קס�:"
+
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "נסיון:"
+
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "זהב: %d"
+
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "עבודה:"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "רמה: %d"
+
+#, fuzzy
 #~ msgid "Access denied."
 #~ msgstr "הגישה נדחתה"
 
@@ -3846,6 +3779,13 @@ msgstr "לל� ש�"
 #~ msgid "Willpower:"
 #~ msgstr "כח רצון:"
 
+#~ msgid "Willpower %+d"
+#~ msgstr "כח רצון %+d"
+
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "כח רצון:"
+
 #, fuzzy
 #~ msgid "Server is full."
 #~ msgstr "השרת מל�"
diff --git a/po/hr.po b/po/hr.po
index a78d85d3..2baccbe9 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-12-13 09:30+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -20,3852 +20,3756 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/npcdialog.cpp:183
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Slijedeći"
-
-#: ../src/main.cpp:60
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl   : Onemogući OpenGL za ovu sesiju"
-
-#: ../src/main.cpp:58
-#, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir    : Direktorij koristiti kao home direktorij"
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Podešavanje"
 
-#: ../src/main.cpp:52
+#: src/client.cpp:679
 #, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -u --skip-update : Presko�i preuzimanje ažuriranja"
+msgid "Connecting to server"
+msgstr "Spajanje na poslužitelja karti..."
 
-#: ../src/main.cpp:46
+#: src/client.cpp:706
 #, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Konfiguracijska datoteka za korištenje"
+msgid "Logging in"
+msgstr "Korisni�ko ime"
 
-#: ../src/main.cpp:53
-msgid "  -D --default        : Choose default character server and character"
+#: src/client.cpp:739
+msgid "Entering game world"
 msgstr ""
 
-#: ../src/main.cpp:57
-#, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir    : Direktorij koristiti kao home direktorij"
-
-#: ../src/main.cpp:48
+#: src/client.cpp:804
 #, fuzzy
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password    : Prijava s ovom lozinkom"
+msgid "Requesting characters"
+msgstr "Odaberi lika"
 
-#: ../src/main.cpp:47
+#: src/client.cpp:833
 #, fuzzy
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username    : Prijava s ovim korisni�kim imenom"
+msgid "Connecting to the game server"
+msgstr "Spajanje na poslužitelja karti..."
 
-#: ../src/main.cpp:49
+#: src/client.cpp:843
 #, fuzzy
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character   : Ulaz s tim likom"
+msgid "Changing game servers"
+msgstr "Server"
 
-#: ../src/main.cpp:56
-#, fuzzy
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data        : Direktorij iz kojeg se u�itavaju podaci igre"
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Greška"
 
-#: ../src/main.cpp:45
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help        : Prikaži ovu pomoć"
+#: src/client.cpp:888
+msgid "Requesting registration details"
+msgstr ""
 
-#: ../src/main.cpp:51
+#: src/client.cpp:915
 #, fuzzy
-msgid "  -p --port           : Login server port"
-msgstr "  -P --password    : Prijava s ovom lozinkom"
+msgid "Password Change"
+msgstr "Lozinka"
 
-#: ../src/main.cpp:50
-#, fuzzy
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -U --username    : Prijava s ovim korisni�kim imenom"
+#: src/client.cpp:916
+msgid "Password changed successfully!"
+msgstr ""
 
-#: ../src/main.cpp:55
+#: src/client.cpp:935
 #, fuzzy
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Presko�i preuzimanje ažuriranja"
+msgid "Email Change"
+msgstr "Izmijeni"
 
-#: ../src/main.cpp:44
+#: src/client.cpp:936
 #, fuzzy
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version     : Prikaži verziju"
-
-#: ../src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1  Vrlo je preporu�ljivo da"
-
-#: ../src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1  Proces ažuriranja je nepotpun."
+msgid "Email changed successfully!"
+msgstr "Član je uspješno unaprijeđen."
 
-#: ../src/gui/updatewindow.cpp:421
+#: src/client.cpp:956
 #, fuzzy
-msgid "##1  you try again later."
-msgstr "##1  pokušate ponovno kasnije"
-
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Preciznost:"
-
-#: ../src/net/tmwa/generalhandler.cpp:230
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "Kriti�ni Udarac"
+msgid "Unregister Successful"
+msgstr "Odjavi"
 
-#: ../src/net/tmwa/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% Izbjegavanje:"
+#: src/client.cpp:957
+msgid "Farewell, come back any time..."
+msgstr ""
 
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
-msgid "%d FPS"
+msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: ../src/gui/debugwindow.cpp:56
+#: src/client.cpp:1281
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "Invalid update host: %s"
 msgstr ""
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
-#, c-format
-msgid "%s doesn't exist and can't be created! Exiting."
+#: src/client.cpp:1315 src/client.cpp:1321
+msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s se pridružio partiji."
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
+msgid "Unknown command."
+msgstr "Nepoznata naredba."
 
-#: ../src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s vas je pozvao/la da se pridružite %s partiji."
+#: src/commandhandler.cpp:160
+msgid "-- Help --"
+msgstr "-- Pomoć --"
 
-#: ../src/gui/socialwindow.cpp:561
-#, fuzzy, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s vas je pozvao/la da se pridružite %s partiji."
+#: src/commandhandler.cpp:161
+msgid "/help > Display this help"
+msgstr "/help > Prikaži ovu pomoć"
 
-#: ../src/gui/socialwindow.cpp:600
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
+#: src/commandhandler.cpp:163
+msgid "/where > Display map name"
+msgstr "/where > Prikaži ime karte"
 
-#: ../src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#: src/commandhandler.cpp:164
+msgid "/who > Display number of online users"
+msgstr "/who > Prikaži broj trenutno prijavljenih korisnika"
 
-#: ../src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s je napustio/la vašu partiju."
+#: src/commandhandler.cpp:165
+msgid "/me > Tell something about yourself"
+msgstr "/me > Recite nešto o sebi"
 
-#: ../src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#: src/commandhandler.cpp:167
+msgid "/clear > Clears this window"
+msgstr "/clear > O�isti ovaj prozor"
 
-#: ../src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s je već �lan partije."
+#: src/commandhandler.cpp:169
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Pošaljite privatnu poruku korisniku"
 
-#: ../src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s nije u vašoj partiji!"
+#: src/commandhandler.cpp:170
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Alias za msg"
 
-#: ../src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s je sada �lan vaše partije."
+#: src/commandhandler.cpp:171
+msgid "/w > Alias of msg"
+msgstr "/w > Alias za msg"
 
-#: ../src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s se pridružio partiji."
+#: src/commandhandler.cpp:172
+msgid "/query > Makes a tab for private messages with another user"
+msgstr "/query > ÄŒini karticu za privatne poruke s drugim korisnikom"
 
-#: ../src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
+#: src/commandhandler.cpp:174
+msgid "/q > Alias of query"
+msgstr "/q > Alias od query"
+
+#: src/commandhandler.cpp:176
+msgid "/ignore > ignore a player"
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s je odbio vašu pozivnicu."
+#: src/commandhandler.cpp:177
+msgid "/unignore > stop ignoring a player"
+msgstr ""
 
-#: ../src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s je odbio vašu pozivnicu."
+#: src/commandhandler.cpp:179
+msgid "/list > Display all public channels"
+msgstr "/list > Prikaži sve javne kanale"
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s želi trgovati s vama, prihvaćate li?"
+#: src/commandhandler.cpp:180
+msgid "/join > Join or create a channel"
+msgstr "/join > Pridruži se ili napravi kanal"
 
-#: ../src/gui/widgets/chattab.cpp:152
-#, fuzzy, c-format
-msgid "%s whispers: %s"
-msgstr "%s Å¡aptanje: "
+#: src/commandhandler.cpp:182
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Napravi novu partiju"
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
-msgid "(empty)"
-msgstr ""
+#: src/commandhandler.cpp:183
+msgid "/party > Invite a user to party"
+msgstr "/party > Pozovite korisnike na partiju"
 
-#: ../src/commandhandler.cpp:222
-msgid "*** only available to a GM ***"
-msgstr "*** dostupno samo za GM ***"
+#: src/commandhandler.cpp:185
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Zapo�ni snimanje chat-a u eksternoj datoteci"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
-msgid "+"
+#: src/commandhandler.cpp:187
+msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
-msgid "-"
+#: src/commandhandler.cpp:189
+msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: ../src/commandhandler.cpp:166
-msgid "-- Help --"
-msgstr "-- Pomoć --"
-
-#: ../src/commandhandler.cpp:201
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globalna obavijest (samo GM)"
 
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: ../src/commandhandler.cpp:173
-msgid "/clear > Clears this window"
-msgstr "/clear > O�isti ovaj prozor"
-
-#: ../src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Zatvara karticu za Å¡aptaje"
-
-#: ../src/commandhandler.cpp:191
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Napravi novu partiju"
-
-#: ../src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr ""
+#: src/commandhandler.cpp:196
+msgid "For more information, type /help <command>."
+msgstr "Za više informacija, utipkajte /pomoć <naredba>."
 
-#: ../src/commandhandler.cpp:167
-msgid "/help > Display this help"
-msgstr "/help > Prikaži ovu pomoć"
+#: src/commandhandler.cpp:200
+msgid "Command: /help"
+msgstr "Naredba: /pomoć"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Prikaži ovu pomoć."
+#: src/commandhandler.cpp:201
+msgid "This command displays a list of all commands available."
+msgstr "Ova naredba prikazuje listu svih raspoloživih naredbi."
 
-#: ../src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
-msgstr ""
+#: src/commandhandler.cpp:203
+msgid "Command: /help <command>"
+msgstr "Naredba: /pomoć <naredba>"
 
-#: ../src/commandhandler.cpp:185
-msgid "/ignore > ignore a player"
-msgstr ""
+#: src/commandhandler.cpp:204
+msgid "This command displays help on <command>."
+msgstr "Ova naredba prikazuje pomoć pri <naredba>."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Pozovite igra�e na vašu partiju"
+#: src/commandhandler.cpp:212
+msgid "Command: /announce <msg>"
+msgstr "Command: /announce <msg>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Pozovite igra�e na vašu partiju"
+#: src/commandhandler.cpp:213
+msgid "*** only available to a GM ***"
+msgstr "*** dostupno samo za GM ***"
 
-#: ../src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr ""
+#: src/commandhandler.cpp:214
+msgid "This command sends the message <msg> to all players currently online."
+msgstr "Ova naredba šalje poruku <msg> svim igra�ima trenutno online."
 
-#: ../src/commandhandler.cpp:189
-msgid "/join > Join or create a channel"
-msgstr "/join > Pridruži se ili napravi kanal"
+#: src/commandhandler.cpp:219
+msgid "Command: /clear"
+msgstr "Naredba: /clear"
 
-#: ../src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Å utni korisnika iz kanala"
+#: src/commandhandler.cpp:220
+msgid "This command clears the chat log of previous chat."
+msgstr "Ova naredba briše chat log prethodnog chata."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
+#: src/commandhandler.cpp:224
 #, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Å utnite nekog iz partije u kojoj ste"
-
-#: ../src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Å utnite nekog iz partije u kojoj ste"
+msgid "Command: /ignore <player>"
+msgstr "Naredba: /item <policy>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
+#: src/commandhandler.cpp:225
 #, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Napustite partiju u kojoj ste"
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Ova naredba prikazuje broj igra�a trenutno online."
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Napustite partiju u kojoj ste"
+#: src/commandhandler.cpp:230
+msgid "Command: /join <channel>"
+msgstr "Naredba: /join <channel>"
 
-#: ../src/commandhandler.cpp:188
-msgid "/list > Display all public channels"
-msgstr "/list > Prikaži sve javne kanale"
+#: src/commandhandler.cpp:231
+msgid "This command makes you enter <channel>."
+msgstr "Ova naredba vas unaša u <channel>."
 
-#: ../src/commandhandler.cpp:171
-msgid "/me > Tell something about yourself"
-msgstr "/me > Recite nešto o sebi"
+#: src/commandhandler.cpp:232
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Ako <channel> ne postoji, onda je napravljen."
 
-#: ../src/commandhandler.cpp:175
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Pošaljite privatnu poruku korisniku"
+#: src/commandhandler.cpp:236
+msgid "Command: /list"
+msgstr "Naredba: /list"
 
-#: ../src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Napravite korisnika operatorom kanala"
+#: src/commandhandler.cpp:237
+msgid "This command shows a list of all channels."
+msgstr "Ova naredba prikazuje listu svih kanala."
 
-#: ../src/commandhandler.cpp:192
-msgid "/party > Invite a user to party"
-msgstr "/party > Pozovite korisnike na partiju"
+#: src/commandhandler.cpp:241
+msgid "Command: /me <message>"
+msgstr "Naredba: /me <message>"
 
-#: ../src/commandhandler.cpp:198
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
+#: src/commandhandler.cpp:242
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Ova naredba govori drugima da vi (radite) <msg>."
 
-#: ../src/commandhandler.cpp:180
-msgid "/q > Alias of query"
-msgstr "/q > Alias od query"
+#: src/commandhandler.cpp:246
+msgid "Command: /msg <nick> <message>"
+msgstr "Naredba: /msg <nick> <message>"
 
-#: ../src/commandhandler.cpp:178
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > ÄŒini karticu za privatne poruke s drugim korisnikom"
+#: src/commandhandler.cpp:247
+msgid "Command: /whisper <nick> <message>"
+msgstr "Naredba: /whisper <nick> <message>"
 
-#: ../src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Napusti kanal"
+#: src/commandhandler.cpp:248
+msgid "Command: /w <nick> <message>"
+msgstr "Naredba: /w <nick> <message>"
 
-#: ../src/commandhandler.cpp:194
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Zapo�ni snimanje chat-a u eksternoj datoteci"
+#: src/commandhandler.cpp:249
+msgid "This command sends the text <message> to <nick>."
+msgstr "Ova naredba Å¡alje tekst <message> za <nick>."
 
-#: ../src/commandhandler.cpp:196
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
+"Ako <nick> ima razmake u sebi, zatvoriti ga u dvostrukim navodnicima (\")."
 
-#: ../src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Postavi temu trenutnog kanala"
+#: src/commandhandler.cpp:255
+msgid "Command: /query <nick>"
+msgstr "Naredba: /query <nick>"
 
-#: ../src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+#: src/commandhandler.cpp:256
+msgid "Command: /q <nick>"
+msgstr "Naredba: /q <nick>"
 
-#: ../src/commandhandler.cpp:186
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:257
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
+"Ova naredba pokušava napraviti karticu za šaptanje između vas i <nick>."
 
-#: ../src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Lista korisnika u trenutnom kanalu"
-
-#: ../src/commandhandler.cpp:177
-msgid "/w > Alias of msg"
-msgstr "/w > Alias za msg"
+#: src/commandhandler.cpp:262
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Naredba: /create <ime-partije>"
 
-#: ../src/commandhandler.cpp:169
-msgid "/where > Display map name"
-msgstr "/where > Prikaži ime karte"
+#: src/commandhandler.cpp:263
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Ove naredbe kreira novu partiju zvanu <party-name>."
 
-#: ../src/commandhandler.cpp:176
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias za msg"
+#: src/commandhandler.cpp:267
+msgid "Command: /party <nick>"
+msgstr "Naredba: /party <nick>"
 
-#: ../src/commandhandler.cpp:170
-msgid "/who > Display number of online users"
-msgstr "/who > Prikaži broj trenutno prijavljenih korisnika"
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Ova naredba poziva <nick> na partiju sa vama."
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr ""
+#: src/commandhandler.cpp:274
+msgid "Command: /present"
+msgstr "Naredba: /present"
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
+#: src/commandhandler.cpp:275
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/commandhandler.cpp:281
+msgid "Command: /record <filename>"
+msgstr "Naredba: /record <filename>"
+
+#: src/commandhandler.cpp:282
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr "Ova naredba zapo�inje snimanje chat log-a u datoteku <filename>."
+
+#: src/commandhandler.cpp:284
+msgid "Command: /record"
+msgstr "Naredba: /record"
+
+#: src/commandhandler.cpp:285
+msgid "This command finishes a recording session."
+msgstr "Ova naredba završava sesiju snimanja."
+
+#: src/commandhandler.cpp:289
+msgid "Command: /toggle <state>"
+msgstr "Naredba: /toggle <state>"
+
+#: src/commandhandler.cpp:290
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ""
+#: src/commandhandler.cpp:295
+msgid "Command: /toggle"
+msgstr "Naredba: /toggle"
 
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: src/commandhandler.cpp:296
+msgid "This command displays the return toggle status."
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:566
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
-msgid "Accept Guild Invite"
-msgstr "Prihvati Pozivnicu za Partiju"
+msgid "Command: /unignore <player>"
+msgstr "Naredba: /item <policy>"
 
-#: ../src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Prihvati Pozivnicu za Partiju"
+#: src/commandhandler.cpp:301
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:466
-#, fuzzy, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Prihvaćen poziv od %s."
+#: src/commandhandler.cpp:306
+msgid "Command: /where"
+msgstr "Naredba: /where"
 
-#: ../src/gui/socialwindow.cpp:447
-#, fuzzy, c-format
-msgid "Accepted party invite from %s."
-msgstr "Prihvaćen poziv od %s."
+#: src/commandhandler.cpp:307
+msgid "This command displays the name of the current map."
+msgstr "Ova naredba prikazuje naziv trenutne karte."
 
-#: ../src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
+#: src/commandhandler.cpp:311
+msgid "Command: /who"
+msgstr "Naredba: /who"
 
-#: ../src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje."
+#: src/commandhandler.cpp:312
+msgid "This command displays the number of players currently online."
+msgstr "Ova naredba prikazuje broj igra�a trenutno online."
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
+#: src/commandhandler.cpp:318
+msgid "Type /help for a list of commands."
+msgstr "Upišite /help za listu svih naredbi."
+
+#: src/commandhandler.cpp:384
+msgid "Cannot send empty whispers!"
+msgstr "Ne mogu poslati prazan Å¡apate!"
+
+#: src/commandhandler.cpp:392
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
+"Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to "
+"vi."
 
-#: ../src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Upravljanje Ra�unom i Likovima"
+#: src/commandhandler.cpp:406
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Zahtjev za pridruživanje kanalu %s."
 
-#: ../src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Account banned"
-msgstr "Ra�un je istekao"
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Ime partije nedostaje."
 
-#: ../src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Account banned."
-msgstr "Ra�un je istekao"
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
+msgid "Please specify a name."
+msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:162
-#, fuzzy
-msgid "Account expired."
-msgstr "Ra�un je istekao"
+#: src/commandhandler.cpp:450
+msgid "Return toggles chat."
+msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Ra�un nije priklju�en. Molimo prvo se prijavite."
+#: src/commandhandler.cpp:450
+msgid "Message closes chat."
+msgstr "Poruka zatvara chat."
 
-#: ../src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Ra�un nije pronađen. Molimo, ponovno se prijavite."
+#: src/commandhandler.cpp:459
+msgid "Return now toggles chat."
+msgstr ""
 
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
-msgstr "Korisni�ki ra�un: %s"
+#: src/commandhandler.cpp:463
+msgid "Message now closes chat."
+msgstr "Poruka sada zatvara chat."
 
-#: ../src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Dodaj"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:171
-#, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|Dodaj ime u chat@@"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
+msgid "Player already ignored!"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
+#: src/commandhandler.cpp:522
 #, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Dudaj u chat@@"
+msgid "Player successfully ignored!"
+msgstr "Partija je uspješno kreirana."
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Okretnost"
+#: src/commandhandler.cpp:524
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "Å apat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "Okretnost %+d"
+#: src/commandhandler.cpp:539
+msgid "Player wasn't ignored!"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Okretnost:"
+#: src/commandhandler.cpp:544
+msgid "Player no longer ignored!"
+msgstr ""
 
-#: ../src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Složi se za trgovanje"
+#: src/commandhandler.cpp:546
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "Å apat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: ../src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Dogovoreno. ÄŒekanje..."
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: ../src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "Sve"
+#: src/game.cpp:172
+msgid "General"
+msgstr "Općenito"
 
-#: ../src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Dozvoli trgovanje"
+#: src/game.cpp:342
+#, fuzzy
+msgid "Screenshot saved as "
+msgstr "Screenshot spremljen u ~/"
 
-#: ../src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Dozvoli Å¡apate"
+#: src/game.cpp:347
+msgid "Saving screenshot failed!"
+msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
+#: src/game.cpp:378
 #, fuzzy
-msgid "Already logged in."
-msgstr "Već prijavljeni"
+msgid "The connection to the server was lost."
+msgstr "Veza s poslužiteljem je bila izgubljena, program će se sada zatvoriti"
 
-#: ../src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Već se snima."
+#: src/game.cpp:382
+msgid "Network Error"
+msgstr "Mreža Greška"
 
-#: ../src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Efekti okruženja"
+#: src/game.cpp:721
+msgid "Ignoring incoming trade requests"
+msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
-#: ../src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "Efekti okruženja"
+#: src/game.cpp:726
+msgid "Accepting incoming trade requests"
+msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
+
+#: src/game.cpp:954
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Ne mogu u�itati karte"
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/game.cpp:955
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Nepoznati �lan pokušava reći: %s"
+msgid "Error while loading %s"
+msgstr "Greška prilikom u�itavanja %s"
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Uništen."
+#: src/gui/beingpopup.cpp:76
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Partija (%s)"
 
-#: ../src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Primjeni"
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Kupi"
 
-#: ../src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Cijena: %s / Ukupno: %s"
 
-#: ../src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
+msgid "+"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Da li ste sigurni da želite obrisati ovog lika?"
-
-#: ../src/gui/socialwindow.cpp:168
-#, fuzzy, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Jeste li sigurni da želite odustati?"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
+msgid "-"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:247
-#, fuzzy, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Jeste li sigurni da želite odustati?"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Izlaz"
 
-#: ../src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Dodijeli"
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
+msgid "Max"
+msgstr "Max"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Napad"
+#: src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Trgovina"
 
-#: ../src/resources/itemdb.cpp:53
-#, c-format
-msgid "Attack %+d"
-msgstr "Napad %+d"
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Prodaj"
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Napad %+d"
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Poništi"
 
-#: ../src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "Prisutnost zapisana u evidentni dnevnik."
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Promijeni Email Adresu"
 
-#: ../src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Zvuk"
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#, c-format
+msgid "Account: %s"
+msgstr "Korisni�ki ra�un: %s"
 
-#: ../src/net/tmwa/generalhandler.cpp:129
+#: src/gui/changeemaildialog.cpp:51
 #, fuzzy
-msgid "Authentication failed."
-msgstr "Autentikacija nije uspjela"
+msgid "Type new email address twice:"
+msgstr "Utipkajte Novu Email Adresu dvaput:"
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
-msgstr ""
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Korisni�ko ime mora biti dugo najmanje %d znakova."
 
-#: ../src/gui/popupmenu.cpp:100
+#: src/gui/changeemaildialog.cpp:134
 #, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|Budi prijatelj %s@@"
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Korisni�ko ime mora biti kraće od %d znakova."
 
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Biće"
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "Nova E-mail Adresa već postoji."
 
-#: ../src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Lišeni života, po�ivate u miru."
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
+msgid "Change Password"
+msgstr "Promijeni Lozinku"
 
-#: ../src/playerrelations.cpp:342
-msgid "Blink name"
-msgstr ""
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Lozinka"
 
-#: ../src/gui/setup_colors.cpp:138
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
-msgid "Blue:"
-msgstr "Plava: "
+msgid "Type new password twice:"
+msgstr "Utipkajte Novu Lozinku dvaput:"
 
-#: ../src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Mjehurići s imenima"
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Mjehurići, bez imena"
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Lozinka mora biti duga najmanje %d znakova."
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Kupi"
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Lozinka mora biti kraća od %d znakova."
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Kalibriraj"
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Poništi"
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Stvori Lika"
 
-#: ../src/commandhandler.cpp:422
-#, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to "
-"vi."
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Ime:"
 
-#: ../src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "Ne mogu poslati prazan chat!"
-
-#: ../src/commandhandler.cpp:401
-msgid "Cannot send empty whispers!"
-msgstr "Ne mogu poslati prazan Å¡apate!"
-
-#: ../src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Neuspjelo vikanje!"
-
-#: ../src/net/tmwa/charserverhandler.cpp:109
+#: src/gui/charcreatedialog.cpp:74
 #, fuzzy
-msgid "Cannot use this ID."
-msgstr "Ne mogu koristiti ovaj ID"
-
-#: ../src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Izmijeni"
+msgid "Hair color:"
+msgstr "Boja kose:"
 
-#: ../src/gui/charselectdialog.cpp:150
+#: src/gui/charcreatedialog.cpp:77
 #, fuzzy
-msgid "Change Email"
-msgstr "Promijeni Email Adresu"
+msgid "Hair style:"
+msgstr "Frizura:"
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Promijeni Email Adresu"
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
+msgid "Create"
+msgstr "Stvori"
 
-#: ../src/gui/worldselectdialog.cpp:76
-#, fuzzy
-msgid "Change Login"
-msgstr "Izmijeni"
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "Muško"
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Promijeni Lozinku"
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "Žensko"
 
-#: ../src/gui/login.cpp:62
-#, fuzzy
-msgid "Change Server"
-msgstr "Server"
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Molimo, rasporedi %d bodova"
 
-#: ../src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "Promjene će stupiti na snagu na promjeni karte."
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "Ime mora imati barem 4 znaka."
 
-#: ../src/client.cpp:813
-#, fuzzy
-msgid "Changing game servers"
-msgstr "Server"
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
+msgstr "Podaci lika su u redu"
 
-#: ../src/gui/setup_video.cpp:460
-#, fuzzy
-msgid "Changing to OpenGL"
-msgstr "Promjena OpenGL-a"
+#: src/gui/charcreatedialog.cpp:256
+#, c-format
+msgid "Please remove %d points"
+msgstr "Molimo, oduzmi %d bodova"
 
-#: ../src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
-msgstr "Kanal operatori mogu kick i op ostale korisnike iz kanala."
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Potvrdi Brisanje Lika"
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "Kanali nisu podržani!"
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Lik izbrisan."
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr "Upravljanje Ra�unom i Likovima"
 
-#: ../src/gui/statuswindow.cpp:238
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Podaci lika su u redu"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Podaci lika su u redu"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Odjavi"
 
-#: ../src/net/manaserv/charhandler.cpp:143
+#: src/gui/charselectdialog.cpp:150
 #, fuzzy
-msgid "Character's name already exists."
-msgstr "Korisni�ko ime već postoji"
+msgid "Change Email"
+msgstr "Promijeni Email Adresu"
 
-#: ../src/net/manaserv/charhandler.cpp:155
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Podaci lika su u redu"
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Obriši"
 
-#: ../src/net/manaserv/charhandler.cpp:158
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
-msgid "Character's stats are too low."
-msgstr "Podaci lika su u redu"
+msgid "Choose"
+msgstr "Zatvori"
+
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
+msgid "(empty)"
+msgstr ""
 
-#: ../src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Chat Prozor"
+#: src/gui/chat.cpp:311
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
+msgstr "%d igra�a je prisutno."
 
-#: ../src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Neuspjelo stvaranje lika!"
+#: src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Prisutnost zapisana u evidentni dnevnik."
 
-#: ../src/gui/charselectdialog.cpp:380
-#, fuzzy
-msgid "Choose"
-msgstr "Zatvori"
+#: src/gui/chat.cpp:493
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Å aptaj prema %s: %s"
 
-#: ../src/gui/worldselectdialog.cpp:77
-#, fuzzy
-msgid "Choose World"
-msgstr "Izaberite vaš server"
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Da"
 
-#: ../src/gui/serverdialog.cpp:196
-#, fuzzy
-msgid "Choose Your Server"
-msgstr "Izaberite vaš server"
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Ne"
 
-#: ../src/gui/socialwindow.cpp:544
-#, fuzzy
-msgid "Choose your guild's name."
-msgstr "Izaberite vaš server"
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:630
-#, fuzzy
-msgid "Choose your party's name."
-msgstr "Izaberite vaš server"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: ../src/gui/npcdialog.cpp:98
-msgid "Clear log"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, fuzzy, c-format
+msgid "Music: %s"
+msgstr "Tema: %s"
+
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Ime: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "Prozor Minikarte"
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
-#, fuzzy
-msgid "Client version is too old."
-msgstr "Verzija klijenta je prestara"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Efekti ÄŒestica"
+
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Detalji ÄŒestica"
+
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Efekti okruženja"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Oprema"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
+msgid "Unequip"
+msgstr "Skini opremu"
+
+#: src/gui/help.cpp:37
+msgid "Help"
+msgstr "Pomoć"
 
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Boje"
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Zalihe"
 
-#: ../src/commandhandler.cpp:221
-msgid "Command: /announce <msg>"
-msgstr "Command: /announce <msg>"
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Pohrana"
 
-#: ../src/commandhandler.cpp:274
-#, fuzzy
-msgid "Command: /away"
-msgstr "Naredba: /who"
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Mjesta:"
 
-#: ../src/commandhandler.cpp:271
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Naredba: /w <nick> <message>"
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
+msgid "Equip"
+msgstr "Opremi"
 
-#: ../src/commandhandler.cpp:228
-msgid "Command: /clear"
-msgstr "Naredba: /clear"
+#: src/gui/inventorywindow.cpp:88
+msgid "Use"
+msgstr "Upotrijebi"
 
-#: ../src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Naredba: /close"
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
 
-#: ../src/commandhandler.cpp:279
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Naredba: /create <ime-partije>"
+msgid "Drop..."
+msgstr "Ispusti"
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Naredba: /exp"
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
+msgid "Split"
+msgstr "Razdvoji"
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Naredba: /exp <policy>"
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
 
-#: ../src/commandhandler.cpp:209
-msgid "Command: /help"
-msgstr "Naredba: /pomoć"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
+msgstr "Težina:"
 
-#: ../src/commandhandler.cpp:212
-msgid "Command: /help <command>"
-msgstr "Naredba: /pomoć <naredba>"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Pohrani"
 
-#: ../src/gui/widgets/whispertab.cpp:88
-#, fuzzy
-msgid "Command: /ignore"
-msgstr "Naredba: /item"
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Preuzmi"
 
-#: ../src/commandhandler.cpp:233
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Naredba: /item <policy>"
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
+msgid "Drop"
+msgstr "Ispusti"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Naredba: /invite <nick>"
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
+msgid "OK"
+msgstr "U redu"
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Naredba: /item"
+#: src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Sve"
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Naredba: /item <policy>"
+#: src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Odaberi koli�inu predmeta za razmjenu."
 
-#: ../src/commandhandler.cpp:239
-msgid "Command: /join <channel>"
-msgstr "Naredba: /join <channel>"
+#: src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Odaberi koli�inu predmeta za ispuštanje."
 
-#: ../src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Naredba: /kick <nadimak>"
+#: src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Odaberite koli�inu predmeta za spremanje."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Naredba: /leave"
+#: src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Odaberite iznos predmeta za preuzimanje."
 
-#: ../src/commandhandler.cpp:245
-msgid "Command: /list"
-msgstr "Naredba: /list"
+#: src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Odaberi koli�inu predmeta za razdvajanje."
 
-#: ../src/commandhandler.cpp:250
-msgid "Command: /me <message>"
-msgstr "Naredba: /me <message>"
+#: src/gui/itempopup.cpp:137
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Težina: "
 
-#: ../src/commandhandler.cpp:255
-msgid "Command: /msg <nick> <message>"
-msgstr "Naredba: /msg <nick> <message>"
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
+msgid "Login"
+msgstr "Korisni�ko ime"
 
-#: ../src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Naredba: /op <nadimak>"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Remember username"
+msgstr "Zapamti korisni�ko ime"
 
-#: ../src/commandhandler.cpp:284
-msgid "Command: /party <nick>"
-msgstr "Naredba: /party <nick>"
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "Registriraj se"
 
-#: ../src/commandhandler.cpp:291
-msgid "Command: /present"
-msgstr "Naredba: /present"
+#: src/gui/login.cpp:62
+#, fuzzy
+msgid "Change Server"
+msgstr "Server"
 
-#: ../src/commandhandler.cpp:265
-msgid "Command: /q <nick>"
-msgstr "Naredba: /q <nick>"
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Dijeljenje predmeta je onemogućeno."
 
-#: ../src/commandhandler.cpp:264
-msgid "Command: /query <nick>"
-msgstr "Naredba: /query <nick>"
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Naredba: /quit"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Karta"
 
-#: ../src/commandhandler.cpp:301
-msgid "Command: /record"
-msgstr "Naredba: /record"
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
 
-#: ../src/commandhandler.cpp:298
-msgid "Command: /record <filename>"
-msgstr "Naredba: /record <filename>"
+#: src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "ÄŒekanje servera"
 
-#: ../src/commandhandler.cpp:312
-msgid "Command: /toggle"
-msgstr "Naredba: /toggle"
+#: src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Slijedeći"
 
-#: ../src/commandhandler.cpp:306
-msgid "Command: /toggle <state>"
-msgstr "Naredba: /toggle <state>"
+#: src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Dostavi"
 
-#: ../src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Naredba: /topic <poruka>"
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Naredba: /item <policy>"
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Naredba: /users"
+#: src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Poništi"
 
-#: ../src/commandhandler.cpp:257
-msgid "Command: /w <nick> <message>"
-msgstr "Naredba: /w <nick> <message>"
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:208
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Slijedeći"
 
-#: ../src/commandhandler.cpp:323
-msgid "Command: /where"
-msgstr "Naredba: /where"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Za:"
 
-#: ../src/commandhandler.cpp:256
-msgid "Command: /whisper <nick> <message>"
-msgstr "Naredba: /whisper <nick> <message>"
+#: src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Pošalji"
 
-#: ../src/commandhandler.cpp:328
-msgid "Command: /who"
-msgstr "Naredba: /who"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Neuspjelo slanje kao pošiljatelj ili nevažeće pismo."
 
-#: ../src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Dovršeno"
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
 
-#: ../src/playerrelations.cpp:312
+#: src/gui/outfitwindow.cpp:70
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Potpuno ignoriraj %s@@"
+msgid "Unequip first"
+msgstr "Skini opremu"
 
-#: ../src/gui/popupmenu.cpp:117
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
-msgid "Completely ignore %s"
-msgstr "@@ignore|Potpuno ignoriraj %s@@"
+msgid "Trade with %s..."
+msgstr "Trgovanje s %s"
 
-#: ../src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Potvrdi Brisanje Lika"
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Napad %+d"
 
-#: ../src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Potvrdi:"
+#: src/gui/popupmenu.cpp:91
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Å apat"
 
-#: ../src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Potvrđeno. Čekanje..."
+#: src/gui/popupmenu.cpp:100
+#, fuzzy, c-format
+msgid "Befriend %s"
+msgstr "@@friend|Budi prijatelj %s@@"
 
-#: ../src/keyboardconfig.cpp:184
+#: src/gui/popupmenu.cpp:105
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Zanemareno"
+
+#: src/gui/popupmenu.cpp:108
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Ignorirano"
+
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
+msgid "Unignore %s"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:233
-#, fuzzy
-msgid "Connect"
-msgstr "Spajanje..."
+#: src/gui/popupmenu.cpp:117
+#, fuzzy, c-format
+msgid "Completely ignore %s"
+msgstr "@@ignore|Potpuno ignoriraj %s@@"
 
-#: ../src/client.cpp:655
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Spajanje na poslužitelja karti..."
+#: src/gui/popupmenu.cpp:130
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
+msgstr "@@guild|Pozovi %s da se pridrži tvom cehu@@"
+
+#: src/gui/popupmenu.cpp:134
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
+msgstr "@@party|Pozovi %s da se pridruži tvojoj skupini@@"
 
-#: ../src/client.cpp:803
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
-msgid "Connecting to the game server"
-msgstr "Spajanje na poslužitelja karti..."
+msgid "Kick player"
+msgstr "Å ut nije uspio!"
 
-#: ../src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Spajanje..."
+#: src/gui/popupmenu.cpp:150
+#, fuzzy, c-format
+msgid "Talk to %s"
+msgstr "@@talk|Govori S %s@@"
 
-#: ../src/net/tmwa/network.cpp:414
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Spajanje na poslužitelja karti..."
+msgid "Kick monster"
+msgstr "@@admin-kick|Šutni �udovište@@"
 
-#: ../src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr ""
+#: src/gui/popupmenu.cpp:171
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@name|Dodaj ime u chat@@"
 
-#: ../src/gui/statuswindow.cpp:244
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Bodovi vještine: %d"
+msgid "Pick up %s"
+msgstr "Pokupi"
 
-#: ../src/game.cpp:950
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
-msgid "Could Not Load Map"
-msgstr "Ne mogu u�itati karte"
+msgid "Add to chat"
+msgstr "@@chat|Dudaj u chat@@"
 
-#: ../src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "Nije se mogla napraviti partija."
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Promijeni poslužitelj"
 
-#: ../src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
-msgstr ""
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Promijeni lika"
 
-#: ../src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Neuspjelo priklju�ivanje družini!"
+#: src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Završavanje snimanja."
 
-#: ../src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "Krađa nije uspjela..."
+#: src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Trenutno ne snima."
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Stvori"
+#: src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Već se snima."
 
-#: ../src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Stvori Lika"
+#: src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Zapo�injanje snimanja..."
 
-#: ../src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Formiraj Ceh"
+#: src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Neuspjeli po�etak snimanja."
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
-#, fuzzy
-msgid "Create Party"
-msgstr "Stvori Lika"
+#: src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Snimanje..."
 
-#: ../src/gui/socialwindow.cpp:507
-#, fuzzy, c-format
-msgid "Creating guild called %s."
-msgstr "Pogreška pri ustanovljavanju ceha."
+#: src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Prestanak snimanja"
 
-#: ../src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Potvrdi:"
 
-#: ../src/gui/socialwindow.cpp:529
+#: src/gui/register.cpp:100
+msgid "Email:"
+msgstr "E-pošta:"
+
+#: src/gui/register.cpp:166
 #, c-format
-msgid "Creating party called %s."
-msgstr ""
+msgid "The username needs to be at least %d characters long."
+msgstr "Korisni�ko ime mora biti dugo najmanje %d znakova."
 
-#: ../src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Korisni�ko ime mora biti kraće od %d znakova."
 
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Kriti�ni Udarac"
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Lozinka mora biti duga najmanje %d znakova."
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+msgid "The password needs to be less than %d characters long."
+msgstr "Lozinka mora biti kraća od %d znakova."
 
-#: ../src/gui/serverdialog.cpp:234
-#, fuzzy
-msgid "Custom Server"
-msgstr "Vlastiti kursor"
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Lozinke se ne podudaraju."
 
-#: ../src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "Vlastiti kursor"
+#: src/gui/serverdialog.cpp:197
+#, fuzzy
+msgid "Choose Your Server"
+msgstr "Izaberite vaš server"
 
-#: ../src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
-msgstr ""
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Poslužitelj:"
 
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr ""
+#: src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Port:"
 
-#: ../src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Debug Prozor"
+#: src/gui/serverdialog.cpp:208
+#, fuzzy
+msgid "Server type:"
+msgstr "Poslužitelj:"
 
-#: ../src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Zadano"
+#: src/gui/serverdialog.cpp:229
+#, fuzzy
+msgid "Connect"
+msgstr "Spajanje..."
 
-#: ../src/net/tmwa/generalhandler.cpp:225
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
-msgid "Defense"
-msgstr "Obrana:"
+msgid "Custom Server"
+msgstr "Vlastiti kursor"
+
+#: src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
 
-#: ../src/resources/itemdb.cpp:54
+#: src/gui/serverdialog.cpp:441
 #, c-format
-msgid "Defense %+d"
-msgstr "Obrana %+d"
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:93
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
-msgid "Delay:"
-msgstr "Odgoda: "
+msgid "Waiting for server..."
+msgstr "ÄŒekanje servera"
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Obriši"
+#: src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Spretnost"
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: src/gui/serverdialog.cpp:552
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Spretnost %+d"
+msgid "requires v%s"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Spretnost:"
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Zvuk"
 
-#: ../src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:105
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "Zanemareno"
+#: src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Zvuk"
 
-#: ../src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Zanemareno"
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Glasnoća zvu�nih efekata"
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Želite li svoju imovinu identificirati?"
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Glasnoća glazbe"
 
-#: ../src/gui/setup_audio.cpp:43
-msgid "Download music"
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Nema teksta"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:442
-#, c-format
-msgid "Downloading server list...%2.2f%%"
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
-msgid "Drop"
-msgstr "Ispusti"
+#: src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "Ovako izgleda boja"
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
-#, fuzzy
-msgid "Drop..."
-msgstr "Ispusti"
+#: src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Boje"
 
-#: ../src/net/tmwa/generalhandler.cpp:145
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
-msgid "Duplicated login."
-msgstr "Dvostruka prijava"
+msgid "Type:"
+msgstr "Tip: "
+
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Stati�no"
 
-#: ../src/client.cpp:905
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Pulsiranje"
+
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Duga"
+
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Spektar"
+
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
-msgid "Email Change"
-msgstr "Izmijeni"
+msgid "Delay:"
+msgstr "Odgoda: "
 
-#: ../src/net/manaserv/loginhandler.cpp:309
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Email adresa već postoji"
+msgid "Red:"
+msgstr "Crvena: "
 
-#: ../src/client.cpp:906
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
-msgid "Email changed successfully!"
-msgstr "Član je uspješno unaprijeđen."
+msgid "Green:"
+msgstr "Zelena: "
 
-#: ../src/gui/register.cpp:100
-msgid "Email:"
-msgstr "E-pošta:"
+#: src/gui/setup_colors.cpp:139
+#, fuzzy
+msgid "Blue:"
+msgstr "Plava: "
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Pre�ica za Ispoljavanje emocija %d"
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Primjeni"
 
-#: ../src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr "Prozor Pre�ica za Ispoljavanje emocija"
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Ponovno pokreni prozore"
 
-#: ../src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Neuspjelo korištenje emotea!"
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Pritisnite tipku za po�etak kalibracije"
 
-#: ../src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Kalibriraj"
 
-#: ../src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr "Omogući igraću palicu"
 
-#: ../src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Omogući/Onemogući Trgovanje"
-
-#: ../src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: ../src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr ""
-
-#: ../src/client.cpp:715
-msgid "Entering game world"
-msgstr ""
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Igraća palica"
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
-msgid "Equip"
-msgstr "Opremi"
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Zaustavi"
 
-#: ../src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
-msgstr "Prvo se opremite strijelama."
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Kružite palicom"
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Oprema"
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Tipkovnica"
 
-#: ../src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Prozor Opreme"
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Dodijeli"
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "Greška"
+#: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Dodijeli"
 
-#: ../src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Pogreška pri ustanovljavanju ceha."
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Zadano"
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
-msgid "Error creating updates directory!"
-msgstr ""
+#: src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Otkriven je Konflikt(i) Tipki."
 
-#: ../src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Naredba: /join <channel>"
+#: src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Ime"
 
-#: ../src/gui/serverdialog.cpp:456
-msgid "Error retreiving server list!"
-msgstr ""
+#: src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Odnos"
 
-#: ../src/game.cpp:951
-#, c-format
-msgid "Error while loading %s"
-msgstr "Greška prilikom u�itavanja %s"
+#: src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutralno"
 
-#: ../src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
+#: src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Prijatelj"
 
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "Exp Obavijest"
+#: src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Zanemareno"
 
-#: ../src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "Exp:"
+#: src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Ignorirano"
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr ""
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
+msgid "???"
+msgstr "???"
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr ""
+#: src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Dozvoli trgovanje"
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr ""
+#: src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Dozvoli Å¡apate"
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
-msgid "Experience sharing unknown."
-msgstr ""
+#: src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Stavi sve Å¡apate u kartice"
 
-#: ../src/gui/setup_video.cpp:238
+#: src/gui/setup_players.cpp:233
 #, fuzzy
-msgid "FPS limit:"
-msgstr "Ograni�enje sli�ica u sekundi"
-
-#: ../src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Neuspješno dodavanje predmeta, iz nepoznatog razloga."
-
-#: ../src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-"Neuspješno dodavanje predmeta. Trgovinski partner nema slobodnog prostora."
+msgid "Show gender"
+msgstr "Prikaži ime"
 
-#: ../src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Neuspješno dodavanje predmeta. Trgovinski partner je preopterećen."
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Nije moguće prodati."
 
-#: ../src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
+#: src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Igra�i"
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Ne mogu stvoriti lik. Najvjerojatnije je ime već zauzeto."
+#: src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "Kad ignorira:"
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "Neuspješno brisanje znaka."
+#: src/gui/setup_video.cpp:134
+msgid "Tiny"
+msgstr "Sićušno"
 
-#: ../src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Neuspješno promicanje �lana."
+#: src/gui/setup_video.cpp:135
+msgid "Small"
+msgstr "Maleno"
 
-#: ../src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "Neuspjelo slanje kao pošiljatelj ili nevažeće pismo."
+#: src/gui/setup_video.cpp:136
+msgid "Medium"
+msgstr "Srednje"
 
-#: ../src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Neuspjeli po�etak snimanja."
+#: src/gui/setup_video.cpp:137
+msgid "Large"
+msgstr "Veliko"
 
-#: ../src/gui/setup_video.cpp:434
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
+#: src/gui/setup_video.cpp:163
+msgid "No text"
+msgstr "Nema teksta"
 
-#: ../src/gui/setup_video.cpp:428
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Tekst"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
-msgid "Failed to use item."
-msgstr "Neuspješno korištenje predmeta."
+#: src/gui/setup_video.cpp:165
+msgid "Bubbles, no names"
+msgstr "Mjehurići, bez imena"
 
-#: ../src/client.cpp:927
-msgid "Farewell, come back any time..."
-msgstr ""
+#: src/gui/setup_video.cpp:166
+msgid "Bubbles with names"
+msgstr "Mjehurići s imenima"
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
-msgid "Female"
-msgstr "Žensko"
+#: src/gui/setup_video.cpp:178
+msgid "off"
+msgstr "isklju�eno"
 
-#: ../src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "Pronađi Put do Miša"
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
+msgid "low"
+msgstr "nisko"
 
-#: ../src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Završavanje snimanja."
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
+msgid "high"
+msgstr "visoko"
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:193
+msgid "medium"
+msgstr "srednje"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:195
+msgid "max"
+msgstr "max"
 
-#: ../src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Veli�ina fonta"
+#: src/gui/setup_video.cpp:217
+msgid "Full screen"
+msgstr "Pregled na �itavom ekranu"
 
-#: ../src/commandhandler.cpp:205
-msgid "For more information, type /help <command>."
-msgstr "Za više informacija, utipkajte /pomoć <naredba>."
+#: src/gui/setup_video.cpp:218
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: ../src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Prijatelj"
+#: src/gui/setup_video.cpp:219
+msgid "Custom cursor"
+msgstr "Vlastiti kursor"
 
-#: ../src/gui/setup_video.cpp:219
-msgid "Full screen"
-msgstr "Pregled na �itavom ekranu"
+#: src/gui/setup_video.cpp:221
+msgid "Visible names"
+msgstr "Vidljiva imena"
 
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "GM Imena"
+#: src/gui/setup_video.cpp:223
+msgid "Particle effects"
+msgstr "Efekt �estica"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/gui/setup_video.cpp:225
 #, fuzzy
-msgid "Game"
-msgstr "Ime"
+msgid "Show own name"
+msgstr "Prikaži ime"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Kraj Igre!"
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
 
-#: ../src/game.cpp:169
-msgid "General"
-msgstr "Općenito"
+#: src/gui/setup_video.cpp:227
+msgid "Show pickup notification"
+msgstr "Prikaži obavijesti o prikupljanju."
 
-#: ../src/gui/widgets/chattab.cpp:126
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Javna obavijest od %s:"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
+msgid "in chat"
+msgstr "u chat-u"
 
-#: ../src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Javna obavijest:"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
+msgid "as particle"
+msgstr "kao �estica"
 
-#: ../src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "FPS limit:"
+msgstr "Ograni�enje sli�ica u sekundi"
+
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:123
+#: src/gui/setup_video.cpp:250
+msgid "Video"
+msgstr "Slika"
+
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Green:"
-msgstr "Zelena: "
+msgid "Show damage"
+msgstr "Prikaži ime"
+
+#: src/gui/setup_video.cpp:258
+msgid "Overhead text"
+msgstr "Tekst iznad glave"
 
-#: ../src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Prozirnost su�elja"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Ceh"
-
-#: ../src/gui/socialwindow.cpp:143
-#, fuzzy, c-format
-msgid "Guild %s quit requested."
-msgstr "Ceh, ustanovljen."
+#: src/gui/setup_video.cpp:260
+msgid "Ambient FX"
+msgstr "Efekti okruženja"
 
-#: ../src/gui/userpalette.cpp:98
+#: src/gui/setup_video.cpp:261
 #, fuzzy
-msgid "Guild Members"
-msgstr "Ceh"
+msgid "Particle detail"
+msgstr "Detalji ÄŒestica"
 
-#: ../src/gui/socialwindow.cpp:543
-#, fuzzy
-msgid "Guild Name"
-msgstr "Ceh"
+#: src/gui/setup_video.cpp:262
+msgid "Font size"
+msgstr "Veli�ina fonta"
 
-#: ../src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Ceh, ustanovljen."
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
+#, fuzzy
+msgid "None"
+msgstr "Ne"
 
-#: ../src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
+#: src/gui/setup_video.cpp:426
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
-#, fuzzy
-msgid "Guild name is missing."
-msgstr "Ime partije nedostaje."
+#: src/gui/setup_video.cpp:432
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr ""
 
-#: ../src/gui/statuswindow.cpp:203
+#: src/gui/setup_video.cpp:443
 #, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: ../src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "Zdravlje %+d"
-
-#: ../src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "HP:"
+msgid "Switching to Full Screen"
+msgstr "Prebacivanje u pregled na �itavom ekranu"
 
-#: ../src/gui/charcreatedialog.cpp:74
-#, fuzzy
-msgid "Hair color:"
-msgstr "Boja kose:"
+#: src/gui/setup_video.cpp:444
+msgid "Restart needed for changes to take effect."
+msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
-#: ../src/gui/charcreatedialog.cpp:77
+#: src/gui/setup_video.cpp:458
 #, fuzzy
-msgid "Hair style:"
-msgstr "Frizura:"
-
-#: ../src/gui/help.cpp:37
-msgid "Help"
-msgstr "Pomoć"
-
-#: ../src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Prozor za Pomoć"
+msgid "Changing to OpenGL"
+msgstr "Promjena OpenGL-a"
 
-#: ../src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Skrij Prozore"
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Ha? Å to je to?"
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Predpostavljam da ovo nije išlo previše dobro."
+#: src/gui/setup_video.cpp:467
+msgid "Applying change to OpenGL requires restart."
+msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
-#: ../src/commandhandler.cpp:241
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Ako <channel> ne postoji, onda je napravljen."
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Dijeljenje predmeta je onemogućeno."
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
 msgstr ""
-"Ako <nick> ima razmake u sebi, zatvoriti ga u dvostrukim navodnicima (\")."
 
-#: ../src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "Da niste bili toliko animirani sad bi podizali tratin�ice."
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Ako ste zadnja osoba u kanalu, kanal će biti izbrisan."
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
+#, fuzzy
+msgid "Screen Resolution Changed"
+msgstr "Rezolucija Ekrana promijenjena"
 
-#: ../src/gui/popupmenu.cpp:108
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "Ignorirano"
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
+msgid "Restart your client for the change to take effect."
+msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
 
-#: ../src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
+#: src/gui/setup_video.cpp:579
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr ""
+#: src/gui/setup_video.cpp:612
+#, fuzzy
+msgid "Particle Effect Settings Changed."
+msgstr "Postavke efekta �estica su promijenjene."
 
-#: ../src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Ignorirano"
+#: src/gui/setup_video.cpp:613
+msgid "Changes will take effect on map change."
+msgstr "Promjene će stupiti na snagu na promjeni karte."
 
-#: ../src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Vještine"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignoriranje nadolazećih zahtjeva za trgovanje."
+#: src/gui/skilldialog.cpp:223
+msgid "Up"
+msgstr "Gore"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Info"
+#: src/gui/skilldialog.cpp:269
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Bodovi vještine: %d"
 
-#: ../src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "Ubacite žeton za nastavak."
+#: src/gui/skilldialog.cpp:351
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Bodovi vještine: %d"
 
-#: ../src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "Nedovoljno zdravlja!"
+#: src/gui/skilldialog.cpp:360
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Vještine"
 
-#: ../src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "Nedovoljno SP-a!"
+#: src/gui/skilldialog.cpp:442
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Nivo: %d"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Inteligencija"
+#: src/gui/skilldialog.cpp:453
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Nivo: %d"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
+#: src/gui/socialwindow.cpp:126
 #, c-format
-msgid "Intelligence %+d"
-msgstr "Inteligencija %+d"
-
-#: ../src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Inteligencija:"
-
-#: ../src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
-msgstr ""
-
-#: ../src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
-msgstr ""
+#: src/gui/socialwindow.cpp:139
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Ceh, ustanovljen."
 
-#: ../src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
+#: src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: ../src/client.cpp:1244
+#: src/gui/socialwindow.cpp:154
 #, c-format
-msgid "Invalid update host: %s"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Zalihe"
-
-#: ../src/keyboardconfig.cpp:72
-msgid "Inventory Window"
-msgstr "Prozor Inventara"
-
-#: ../src/localplayer.cpp:1254
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
-msgid "Inventory is full."
-msgstr "Server je pun"
-
-#: ../src/gui/socialwindow.cpp:334
-#, fuzzy
-msgid "Invite"
-msgstr "Pozovi Korisnika"
-
-#: ../src/gui/popupmenu.cpp:130
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|Pozovi %s da se pridrži tvom cehu@@"
+msgid "Leave Guild?"
+msgstr "Formiraj Ceh"
 
-#: ../src/gui/popupmenu.cpp:134
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|Pozovi %s da se pridruži tvojoj skupini@@"
-
-#: ../src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Pozivnica je poslana."
-
-#: ../src/gui/socialwindow.cpp:128
-#, c-format
-msgid "Invited user %s to guild %s."
-msgstr ""
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Jeste li sigurni da želite odustati?"
 
-#: ../src/net/tmwa/partyhandler.cpp:335
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Pozovite korisnike na partiju"
 
-#: ../src/net/tmwa/partyhandler.cpp:340
+#: src/gui/socialwindow.cpp:218
 #, c-format
-msgid "Inviting failed, because you can't see a player called %s."
+msgid "Party %s quit requested."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Pre�ac do Predmeta %d"
-
-#: ../src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Prozor za Pre�ice do Predmeta"
+#: src/gui/socialwindow.cpp:232
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Pozovite korisnike na partiju"
 
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
+#: src/gui/socialwindow.cpp:233
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
+#: src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
-msgstr ""
+#: src/gui/socialwindow.cpp:243
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Jeste li sigurni da želite odustati?"
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Dijeljenje predmeta je onemogućeno."
+#: src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Formiraj Ceh"
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Dijeljenje predmeta je omogućeno.moguće."
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
+#, fuzzy
+msgid "Create Party"
+msgstr "Stvori Lika"
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "Dijeljenje predmeta nije moguće."
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:141
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
-msgid "Item sharing unknown."
-msgstr "Dijeljenje predmeta je omogućeno.moguće."
+msgid "Invite"
+msgstr "Pozovi Korisnika"
 
-#: ../src/gui/statuswindow.cpp:234
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
-msgid "Job"
-msgstr "Zadatak:"
+msgid "Leave"
+msgstr "Veliko"
 
-#: ../src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Zadatak:"
+#: src/gui/socialwindow.cpp:443
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Prihvaćen poziv od %s."
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
-#, c-format
-msgid "Job: %d"
-msgstr "Zadatak: %d"
+#: src/gui/socialwindow.cpp:449
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Odbijen poziv od %s."
 
-#: ../src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Pridružen pertiji."
+#: src/gui/socialwindow.cpp:462
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Prihvaćen poziv od %s."
 
-#: ../src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Igraća palica"
+#: src/gui/socialwindow.cpp:468
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Odbijen poziv od %s."
 
-#: ../src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Otkriven je Konflikt(i) Tipki."
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Tipkovnica"
+#: src/gui/socialwindow.cpp:504
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Pogreška pri ustanovljavanju ceha."
 
-#: ../src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Å ut nije uspio!"
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:163
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|Šutni �udovište@@"
+msgid "Guild Name"
+msgstr "Ceh"
 
-#: ../src/gui/popupmenu.cpp:141
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
-msgid "Kick player"
-msgstr "Å ut nije uspio!"
+msgid "Choose your guild's name."
+msgstr "Izaberite vaš server"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Å ut uspio!"
+#: src/gui/socialwindow.cpp:554
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: ../src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Veliko"
+#: src/gui/socialwindow.cpp:559
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: ../src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
-msgid "Leave"
-msgstr "Veliko"
+msgid "Accept Guild Invite"
+msgstr "Prihvati Pozivnicu za Partiju"
 
-#: ../src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:576
+msgid "Received party request, but one already exists."
+msgstr "Primljen zahtjev za partiju, ali ona već postoji."
+
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
-msgid "Leave Guild?"
-msgstr "Formiraj Ceh"
+msgid "You have been invited you to join a party."
+msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
-#: ../src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
-msgstr ""
+#: src/gui/socialwindow.cpp:589
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: ../src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Nivo: %d"
+#: src/gui/socialwindow.cpp:597
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/socialwindow.cpp:602
 #, c-format
-msgid "Level: %d"
-msgstr "Nivo: %d"
+msgid "%s has invited you to join the %s party."
+msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: ../src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Zahtjev za pridruživanje kanalu %s."
+#: src/gui/socialwindow.cpp:610
+msgid "Accept Party Invite"
+msgstr "Prihvati Pozivnicu za Partiju"
 
-#: ../src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Kriti�ni Udarac"
+#: src/gui/socialwindow.cpp:621
+msgid "Cannot create party. You are already in a party"
+msgstr ""
 
-#: ../src/gui/userpalette.cpp:107
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "Igra� pogađa Čudovište"
+msgid "Party Name"
+msgstr "Partija"
 
-#: ../src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
+#: src/gui/socialwindow.cpp:627
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Izaberite vaš server"
 
-#: ../src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
+msgid "Specials"
 msgstr ""
 
-#: ../src/client.cpp:682
-#, fuzzy
-msgid "Logging in"
-msgstr "Korisni�ko ime"
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
+#, c-format
+msgid "Level: %d"
+msgstr "Nivo: %d"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
-msgid "Login"
-msgstr "Korisni�ko ime"
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
+#, c-format
+msgid "Money: %s"
+msgstr "Novac: %s"
 
-#: ../src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#: src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "HP:"
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Izgleda da su vam predali vašu glavu."
+#: src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Exp:"
 
-#: ../src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Sreća"
+#: src/gui/statuswindow.cpp:130
+msgid "MP:"
+msgstr "MP:"
 
-#: ../src/net/tmwa/generalhandler.cpp:106
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
-msgid "Luck %+d"
-msgstr "Sreća %+d"
+msgid "Job: %d"
+msgstr "Zadatak: %d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Sreća:"
+#: src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Zadatak:"
 
-#: ../src/gui/skilldialog.cpp:455
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Nivo: %d"
+msgid "Character points: %d"
+msgstr "Podaci lika su u redu"
 
-#: ../src/gui/skilldialog.cpp:444
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Nivo: %d"
-
-#: ../src/net/tmwa/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Attack"
-msgstr "M.Napad:"
+msgid "Correction points: %d"
+msgstr "Bodovi vještine: %d"
 
-#: ../src/net/tmwa/generalhandler.cpp:227
-#, fuzzy
-msgid "M.Defense"
-msgstr "M.Obrana:"
+#: src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Predloži razmjenu"
 
-#: ../src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
+#: src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Potvrđeno. Čekanje..."
 
-#: ../src/resources/itemdb.cpp:56
-#, c-format
-msgid "MP %+d"
-msgstr "Mana %+d"
+#: src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Složi se za trgovanje"
 
-#: ../src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "MP:"
+#: src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Dogovoreno. ÄŒekanje..."
 
-#: ../src/net/tmwa/chathandler.cpp:190
-#, fuzzy
-msgid "MVP player."
-msgstr "Igra�"
+#: src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Trgovanje: Vi"
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
-msgid "Male"
-msgstr "Muško"
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Trgovanje"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Karta"
+#: src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Dodaj"
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Ime: %s"
+msgid "You get %s"
+msgstr "Vi dobijete %s."
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Max"
+#: src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Daješ:"
 
-#: ../src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Srednje"
+#: src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Izmijeni"
 
-#: ../src/gui/socialwindow.cpp:157
-msgid "Member Invite to Guild"
+#: src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:236
-#, fuzzy
-msgid "Member Invite to Party"
-msgstr "/party > Pozovite korisnike na partiju"
-
-#: ../src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Član je uspješno unaprijeđen."
+#: src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "Nemate dovoljno novca."
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Poruka"
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Ime: %s"
 
-#: ../src/commandhandler.cpp:480
-msgid "Message closes chat."
-msgstr "Poruka zatvara chat."
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Ažuriranje"
 
-#: ../src/commandhandler.cpp:493
-msgid "Message now closes chat."
-msgstr "Poruka sada zatvara chat."
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Spajanje..."
 
-#: ../src/keyboardconfig.cpp:75
-msgid "Minimap Window"
-msgstr "Prozor Minikarte"
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Igraj"
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "Prozor Minikarte"
+#: src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1  Proces ažuriranja je nepotpun."
 
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Promašaji"
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1  Vrlo je preporu�ljivo da"
 
-#: ../src/gui/statuswindow.cpp:224
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
-msgid "Money"
-msgstr "Novac: %d"
-
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
-#, c-format
-msgid "Money: %s"
-msgstr "Novac: %s"
+msgid "##1  you try again later."
+msgstr "##1  pokušate ponovno kasnije"
 
-#: ../src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Čudovište pogađa Igra�a"
+#: src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Dovršeno"
 
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Čudovišta"
+#: src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Lista korisnika u trenutnom kanalu"
 
-#: ../src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Pomakni Dolje"
+#: src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Postavi temu trenutnog kanala"
 
-#: ../src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Pomakni Ulijevo"
+#: src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Napusti kanal"
 
-#: ../src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Pomakni Udesno"
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Napravite korisnika operatorom kanala"
 
-#: ../src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Pomakni Gore"
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Å utni korisnika iz kanala"
 
-#: ../src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Glasnoća glazbe"
+#: src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Naredba: /users"
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
-#, fuzzy, c-format
-msgid "Music: %s"
-msgstr "Tema: %s"
+#: src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Ova naredba prikazuje korisnike u ovom kanalu."
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Naredba: /topic <poruka>"
 
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPCs"
+#: src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Ova naredba postavlja temu za <message>."
 
-#: ../src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Ime"
+#: src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Naredba: /quit"
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Ime:"
+#: src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Ova naredba napušta trenutni kanal."
 
-#: ../src/gui/unregisterdialog.cpp:51
-#, c-format
-msgid "Name: %s"
-msgstr "Ime: %s"
+#: src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Ako ste zadnja osoba u kanalu, kanal će biti izbrisan."
 
-#: ../src/gui/ministatus.cpp:157
-msgid "Need"
-msgstr ""
+#: src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Naredba: /op <nadimak>"
 
-#: ../src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Trebate korisnika za kick!"
+#: src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Ova naredba �ini <nadimak> operatorom kanala."
 
-#: ../src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
-msgstr "Trebate korisnika za op!"
+#: src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
+msgstr "Kanal operatori mogu kick i op ostale korisnike iz kanala."
 
-#: ../src/game.cpp:372
-msgid "Network Error"
-msgstr "Mreža Greška"
+#: src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Naredba: /kick <nadimak>"
 
-#: ../src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutralno"
+#: src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Ova naredba napravi da <nick> napusti kanal."
 
-#: ../src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Nova e-mail adresa neto�na"
+#: src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr "Trebate korisnika za op!"
 
-#: ../src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Nova lozinka je neto�na"
+#: src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Trebate korisnika za kick!"
 
-#: ../src/net/tmwa/loginhandler.cpp:92
-#, fuzzy
-msgid "New password too short."
-msgstr "Nova lozinka je prekratka"
+#: src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Javna obavijest:"
 
-#: ../src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Slijedeći"
+#: src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Javna obavijest od %s:"
 
-#: ../src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Sljedeća Chat Kartica"
+#: src/gui/widgets/chattab.cpp:153
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "%s Å¡aptanje: "
 
-#: ../src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Ne"
+#: src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Ne mogu poslati prazan chat!"
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
+#: src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
+#: src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Nijedan od servera igre nije dostupan."
-
-#: ../src/net/tmwa/generalhandler.cpp:132
-#, fuzzy
-msgid "No servers available."
-msgstr "Nema dostupnih poslužitelji"
+#: src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Zatvara karticu za Å¡aptaje"
 
-#: ../src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Nema teksta"
+#: src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Naredba: /close"
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Ne, djeco. Vaš lik zapravo nije umro. On... err... je otišao na bolje mjesto."
+#: src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Ova naredba zatvara trenutnu karticu za Å¡aptaje."
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
-msgid "None"
-msgstr "Ne"
+msgid "Command: /ignore"
+msgstr "Naredba: /item"
 
-#: ../src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Trenutno ne snima."
+#: src/gui/widgets/whispertab.cpp:90
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Ova naredba prikazuje broj igra�a trenutno online."
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
-msgid "Not logged in."
-msgstr "Već prijavljeni"
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Ova naredba zapo�inje snimanje chat log-a u datoteku <filename>."
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Ništa za prodati."
+#: src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Stanje"
 
-#: ../src/gui/setup_audio.cpp:94
-#, fuzzy
-msgid "Notice"
-msgstr "Nema teksta"
+#: src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Kratica"
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
-msgid "OK"
-msgstr "U redu"
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Odaberite OK"
 
-#: ../src/net/manaserv/loginhandler.cpp:152
+#: src/gui/worldselectdialog.cpp:76
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Stara e-mail adresa neto�na"
+msgid "Change Login"
+msgstr "Izmijeni"
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
+#: src/gui/worldselectdialog.cpp:77
 #, fuzzy
-msgid "Old password incorrect."
-msgstr "Stara lozinka je neto�na"
+msgid "Choose World"
+msgstr "Izaberite vaš server"
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr ""
+#: src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Pomakni Gore"
 
-#: ../src/net/tmwa/gamehandler.cpp:87
-#, c-format
-msgid "Online users: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Pomakni Dolje"
 
-#: ../src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Pomakni Ulijevo"
 
-#: ../src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Pomakni Udesno"
 
-#: ../src/main.cpp:43
-msgid "Options:"
-msgstr "Opcije:"
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Napad"
 
-#: ../src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Igra� pogađa Čudovište"
+#: src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Meta i Napad"
 
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Imena Drugih Igra�a"
+#: src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Smajlić"
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Govori"
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr ""
+#: src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Prekini Napad"
 
-#: ../src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:48
 #, fuzzy
-msgid "Outfits Window"
-msgstr "Prozor Statusa"
-
-#: ../src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr "Tekst iznad glave"
+msgid "Target Monster"
+msgstr "Ciljaj Najbližeg"
 
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Vlastito Ime"
+#: src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "Ciljaj NPC"
 
-#: ../src/gui/setup_video.cpp:615
-#, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Postavke efekta �estica su promijenjene."
+#: src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Ciljaj Igra�a"
 
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Efekti ÄŒestica"
+#: src/keyboardconfig.cpp:51
+msgid "Pickup"
+msgstr "Pokupi"
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Efekti ÄŒestica"
+#: src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Skrij Prozore"
 
-#: ../src/gui/setup_video.cpp:263
-#, fuzzy
-msgid "Particle detail"
-msgstr "Detalji ÄŒestica"
+#: src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Sjedni"
 
-#: ../src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Detalji ÄŒestica"
+#: src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Snimak zaslona"
 
-#: ../src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Efekt �estica"
+#: src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Omogući/Onemogući Trgovanje"
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Partija"
+#: src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "Pronađi Put do Miša"
 
-#: ../src/gui/socialwindow.cpp:222
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
-msgid "Party %s quit requested."
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Partija"
-
-#: ../src/gui/socialwindow.cpp:629
-#, fuzzy
-msgid "Party Name"
-msgstr "Partija"
-
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Ime partije nedostaje."
-
-#: ../src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Partija je uspješno kreirana."
+msgid "Item Shortcut %d"
+msgstr "Pre�ac do Predmeta %d"
 
-#: ../src/gui/beingpopup.cpp:76
-#, fuzzy, c-format
-msgid "Party: %s"
-msgstr "Partija (%s)"
+#: src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Prozor za Pomoć"
 
-#: ../src/client.cpp:885
-#, fuzzy
-msgid "Password Change"
-msgstr "Lozinka"
+#: src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Prozor Statusa"
 
-#: ../src/client.cpp:886
-msgid "Password changed successfully!"
-msgstr ""
+#: src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Prozor Inventara"
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Lozinka"
+#: src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Prozor Opreme"
 
-#: ../src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Lozinke se ne podudaraju."
+#: src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Prozor Vještine"
 
-#: ../src/gui/popupmenu.cpp:188
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "Pokupi"
+#: src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Prozor Minikarte"
 
-#: ../src/keyboardconfig.cpp:52
-msgid "Pickup"
-msgstr "Pokupi"
+#: src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Chat Prozor"
 
-#: ../src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "Obavijest Sakupljanja"
+#: src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Prozor za Pre�ice do Predmeta"
 
-#: ../src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Igraj"
+#: src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Prozor za Postavke"
 
-#: ../src/commandhandler.cpp:545
-msgid "Player already ignored!"
-msgstr ""
+#: src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Debug Prozor"
 
-#: ../src/commandhandler.cpp:554
+#: src/keyboardconfig.cpp:79
 #, fuzzy
-msgid "Player could not be ignored!"
-msgstr "Å apat nije mogao biti poslan, ignorirani ste od strane korisnika."
+msgid "Social Window"
+msgstr "Prozor Vještine"
 
-#: ../src/commandhandler.cpp:576
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "Å apat nije mogao biti poslan, ignorirani ste od strane korisnika."
+#: src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Prozor Pre�ica za Ispoljavanje emocija"
 
-#: ../src/net/manaserv/charhandler.cpp:193
+#: src/keyboardconfig.cpp:81
 #, fuzzy
-msgid "Player deleted."
-msgstr "Lik izbrisan."
+msgid "Outfits Window"
+msgstr "Prozor Statusa"
 
-#: ../src/commandhandler.cpp:574
-msgid "Player no longer ignored!"
+#: src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
 msgstr ""
 
-#: ../src/commandhandler.cpp:552
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "Partija je uspješno kreirana."
-
-#: ../src/commandhandler.cpp:569
-msgid "Player wasn't ignored!"
+#: src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Igra�i"
-
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Igra� pogađa Čudovište"
-
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Molimo, rasporedi %d bodova"
-
-#: ../src/gui/charcreatedialog.cpp:256
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
-msgid "Please remove %d points"
-msgstr "Molimo, oduzmi %d bodova"
+msgid "Emote Shortcut %d"
+msgstr "Pre�ica za Ispoljavanje emocija %d"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
-msgid "Please specify a name."
+#: src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
+#: src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Pomakni Chat Gore"
 
-#: ../src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Otrov nije uspio..."
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Pomakni Chat Dolje"
 
-#: ../src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Port:"
+#: src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "Prethodna Chat Kartica"
 
-#: ../src/gui/serverdialog.cpp:452
-msgid "Preparing download"
-msgstr ""
+#: src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Sljedeća Chat Kartica"
 
-#: ../src/gui/chat.cpp:307
-#, fuzzy, c-format
-msgid "Present: %s; %d players are present."
-msgstr "%d igra�a je prisutno."
+#: src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "Odaberite OK"
 
-#: ../src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
+#: src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Pritisnite tipku za po�etak kalibracije"
-
-#: ../src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "Prethodna Chat Kartica"
+#: src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr ""
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
+#: src/keyboardconfig.cpp:183
 #, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Cijena: %s / Ukupno: %s"
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
 
-#: ../src/playerrelations.cpp:326
-msgid "Print '...'"
+#: src/localplayer.cpp:985
+msgid "Unable to pick up item."
 msgstr ""
 
-#: ../src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Predloži razmjenu"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:994
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Pokupili ste %s [@@%d|%s@@]."
+msgstr[1] "Pokupili ste %s [@@%d|%s@@]."
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Pulsiranje"
+#: src/main.cpp:42
+msgid "mana [options] [mana-file]"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr "Stavi sve Å¡apate u kartice"
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Izlaz"
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Duga"
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:556
+#: src/main.cpp:47
+msgid "Options:"
+msgstr "Opcije:"
+
+#: src/main.cpp:48
 #, fuzzy
-msgid "Received guild request, but one already exists."
-msgstr "Primljen zahtjev za partiju, ali ona već postoji."
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version     : Prikaži verziju"
 
-#: ../src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr "Primljen zahtjev za partiju, ali ona već postoji."
+#: src/main.cpp:49
+#, fuzzy
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help        : Prikaži ovu pomoć"
 
-#: ../src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Snimanje..."
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : Konfiguracijska datoteka za korištenje"
 
-#: ../src/gui/setup_colors.cpp:108
+#: src/main.cpp:51
 #, fuzzy
-msgid "Red:"
-msgstr "Crvena: "
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username    : Prijava s ovim korisni�kim imenom"
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
-msgid "Register"
-msgstr "Registriraj se"
+#: src/main.cpp:52
+#, fuzzy
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password    : Prijava s ovom lozinkom"
 
-#: ../src/gui/login.cpp:129
+#: src/main.cpp:53
 #, fuzzy
-msgid "Registration disabled"
-msgstr "Dijeljenje predmeta je onemogućeno."
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character   : Ulaz s tim likom"
 
-#: ../src/net/tmwa/loginhandler.cpp:165
+#: src/main.cpp:54
 #, fuzzy
-msgid "Rejected from server."
-msgstr "Odbijeno od poslužitelja"
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -U --username    : Prijava s ovim korisni�kim imenom"
 
-#: ../src/gui/socialwindow.cpp:472
-#, fuzzy, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Odbijen poziv od %s."
+#: src/main.cpp:55
+#, fuzzy
+msgid "  -p --port           : Login server port"
+msgstr "  -P --password    : Prijava s ovom lozinkom"
 
-#: ../src/gui/socialwindow.cpp:453
-#, fuzzy, c-format
-msgid "Rejected party invite from %s."
-msgstr "Odbijen poziv od %s."
+#: src/main.cpp:56
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -u --skip-update : Presko�i preuzimanje ažuriranja"
 
-#: ../src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Odnos"
+#: src/main.cpp:57
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
 
-#: ../src/gui/login.cpp:60
+#: src/main.cpp:59
 #, fuzzy
-msgid "Remember username"
-msgstr "Zapamti korisni�ko ime"
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Presko�i preuzimanje ažuriranja"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Zahtjev za Trgovanje"
+#: src/main.cpp:60
+#, fuzzy
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data        : Direktorij iz kojeg se u�itavaju podaci igre"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/main.cpp:61
 #, fuzzy
-msgid "Request to quit denied!"
-msgstr "Zahtjev za Trgovanje"
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir    : Direktorij koristiti kao home direktorij"
 
-#: ../src/client.cpp:774
+#: src/main.cpp:62
 #, fuzzy
-msgid "Requesting characters"
-msgstr "Odaberi lika"
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Konfiguracijska datoteka za korištenje"
 
-#: ../src/client.cpp:858
-msgid "Requesting registration details"
-msgstr ""
+#: src/main.cpp:63
+#, fuzzy
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir    : Direktorij koristiti kao home direktorij"
 
-#: ../src/commandhandler.cpp:436
-#, c-format
-msgid "Requesting to join channel %s."
-msgstr "Zahtjev za pridruživanje kanalu %s."
+#: src/main.cpp:65
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl   : Onemogući OpenGL za ovu sesiju"
 
-#: ../src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Poništi"
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Vi ste mrtvi."
 
-#: ../src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Ponovno pokreni prozore"
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Žao nam je obavijestiti vas da je vaš lik je bio ubijen u borbi."
 
-#: ../src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Niste više tako živi."
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Preuzmi"
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Kraj Igre!"
 
-#: ../src/commandhandler.cpp:489
-msgid "Return now toggles chat."
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
 msgstr ""
+"Ne, djeco. Vaš lik zapravo nije umro. On... err... je otišao na bolje mjesto."
 
-#: ../src/commandhandler.cpp:480
-msgid "Return toggles chat."
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Kružite palicom"
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Predpostavljam da ovo nije išlo previše dobro."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Želite li svoju imovinu identificirati?"
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Nažalost, ni traga od vas nije nikada pronađeno ..."
 
-#: ../src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Spremanje screenshot-a nije uspjelo!"
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Uništen."
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Rezolucija Ekrana promijenjena"
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Izgleda da su vam predali vašu glavu."
 
-#: ../src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Snimak zaslona"
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Uprskali ste opet, odbacite svoje tijelo u kanalizaciju i nabavite novo."
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
 
-#: ../src/game.cpp:333
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
-msgid "Screenshot saved as "
-msgstr "Screenshot spremljen u ~/"
+msgid "You Died"
+msgstr "Umrli ste"
 
-#: ../src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Pomakni Chat Dolje"
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Već prijavljeni"
 
-#: ../src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Pomakni Chat Gore"
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Čini se da trebate više novca... ;-)"
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "Odaberite OK"
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Korisni�ko ime već postoji"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
 
-#: ../src/gui/worldselectdialog.cpp:71
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
-msgid "Select World"
-msgstr "Odaberite OK"
+msgid "Character's stats are too high."
+msgstr "Podaci lika su u redu"
 
-#: ../src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Odaberi koli�inu predmeta za ispuštanje."
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Podaci lika su u redu"
 
-#: ../src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
-msgstr "Odaberite iznos predmeta za preuzimanje."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: ../src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Odaberi koli�inu predmeta za razdvajanje."
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Nepoznata greška"
 
-#: ../src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Odaberite koli�inu predmeta za spremanje."
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
 
-#: ../src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Odaberi koli�inu predmeta za razmjenu."
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Lik izbrisan."
 
-#: ../src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Odaberi koli�inu predmeta za razmjenu."
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Prodaj"
-
-#: ../src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Pošalji"
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Nepoznata greška"
 
-#: ../src/gui/serverdialog.cpp:211
-#, fuzzy
-msgid "Server type:"
-msgstr "Poslužitelj:"
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Nijedan od servera igre nije dostupan."
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Poslužitelj:"
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Tema: %s"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Podešavanje"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Igra� pogađa Čudovište"
 
-#: ../src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Prozor za Postavke"
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Naredba: /join <channel>"
 
-#: ../src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Glasnoća zvu�nih efekata"
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Zahtjev za pridruživanje kanalu %s."
 
-#: ../src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Trgovina"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#: ../src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Kratica"
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s se pridružio partiji."
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
-msgid "Show IP: Off"
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
 msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
-msgid "Show IP: On"
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254
-#, fuzzy
-msgid "Show damage"
-msgstr "Prikaži ime"
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:232
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
-msgid "Show gender"
-msgstr "Prikaži ime"
+msgid "Unknown channel event."
+msgstr "Nepoznata naredba."
 
-#: ../src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show own name"
-msgstr "Prikaži ime"
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Ceh, ustanovljen."
 
-#: ../src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
-msgstr "Prikaži obavijesti o prikupljanju."
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Pogreška pri ustanovljavanju ceha."
 
-#: ../src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "Sjedni"
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Pozivnica je poslana."
 
-#: ../src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Neuspjelo sjedanje!"
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Član je uspješno unaprijeđen."
 
-#: ../src/gui/skilldialog.cpp:362
-#, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Vještine"
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Neuspješno promicanje �lana."
 
-#: ../src/gui/skilldialog.cpp:353
-#, fuzzy, c-format
-msgid "Skill Set %d"
-msgstr "Bodovi vještine: %d"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Pogrešan magi�ni_simbol"
 
-#: ../src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Prozor Vještine"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Već prijavljeni"
 
-#: ../src/gui/skilldialog.cpp:271
-#, fuzzy, c-format
-msgid "Skill points available: %d"
-msgstr "Bodovi vještine: %d"
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Ra�un je istekao"
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Vještine"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Nova lozinka je neto�na"
 
-#: ../src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr "Mjesta:"
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Stara lozinka je neto�na"
 
-#: ../src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Maleno"
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Ra�un nije priklju�en. Molimo prvo se prijavite."
 
-#: ../src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Smajlić"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Nova e-mail adresa neto�na"
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
-msgid "Social"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Stara e-mail adresa neto�na"
 
-#: ../src/keyboardconfig.cpp:80
+#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "Social Window"
-msgstr "Prozor Vještine"
+msgid "The new email address already exists."
+msgstr "Nova E-mail Adresa već postoji."
 
-#: ../src/gui/setup_video.cpp:582
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:136
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Netko drugi pokušava korištiti ovaj ra�un"
-
-#: ../src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Zvuk"
-
-#: ../src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr ""
+msgid "Client version is too old."
+msgstr "Verzija klijenta je prestara"
 
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Pogrešno korisni�ko ime ili lozinka"
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Ra�un je istekao"
 
-#: ../src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Spektar"
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Pogrešno korisni�ko ime, lozinka ili email adresa"
 
-#: ../src/net/tmwa/generalhandler.cpp:142
+#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Speed hack detected."
-msgstr "Otkrit brzi hack"
+msgid "Username already exists."
+msgstr "Korisni�ko ime već postoji"
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
-msgid "Split"
-msgstr "Razdvoji"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Email adresa već postoji"
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: ../src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Zapo�injanje snimanja..."
-
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Stati�no"
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Pridružen pertiji."
 
-#: ../src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Stanje"
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s se pridružio partiji."
 
-#: ../src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Prozor Statusa"
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s je odbio vašu pozivnicu."
 
-#: ../src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Zaustavi"
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje."
 
-#: ../src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Prekini Napad"
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignoriranje nadolazećih zahtjeva za trgovanje."
 
-#: ../src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Prestanak snimanja"
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Zahtjev za Trgovanje"
 
-#: ../src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Pohrana"
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s želi trgovati s vama, prihvaćate li?"
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
-msgid "Store"
-msgstr "Pohrani"
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Trgovanje s %s"
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Snaga"
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Otkazano trgovanje."
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Snaga %+d"
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Trgovanje je završeno."
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Snaga:"
+#: src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Å ut nije uspio!"
 
-#: ../src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Dostavi"
+#: src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Å ut uspio!"
 
-#: ../src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr ""
+#: src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Ništa za prodati."
 
-#: ../src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Promijeni lika"
+#: src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Hvala za kupnju."
 
-#: ../src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Promijeni poslužitelj"
+#: src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Ne može se kupiti"
 
-#: ../src/gui/setup_video.cpp:445
-#, fuzzy
-msgid "Switching to Full Screen"
-msgstr "Prebacivanje u pregled na �itavom ekranu"
+#: src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Hvala za prodaju."
 
-#: ../src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Govori"
+#: src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Nije moguće prodati."
 
-#: ../src/gui/popupmenu.cpp:150
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@talk|Govori S %s@@"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Meta i Napad"
+#: src/net/tmwa/charserverhandler.cpp:107
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Ne mogu koristiti ovaj ID"
 
-#: ../src/keyboardconfig.cpp:49
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Target Monster"
-msgstr "Ciljaj Najbližeg"
+msgid "Unknown char-server failure."
+msgstr "Nepoznata greška"
 
-#: ../src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "Ciljaj NPC"
+#: src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Ne mogu stvoriti lik. Najvjerojatnije je ime već zauzeto."
 
-#: ../src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Ciljaj Igra�a"
+#: src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Lik izbrisan."
 
-#: ../src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Tekst"
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Neuspješno brisanje znaka."
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Hvala za kupnju."
+#: src/net/tmwa/charserverhandler.cpp:266
+msgid "Strength:"
+msgstr "Snaga:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Hvala za prodaju."
+#: src/net/tmwa/charserverhandler.cpp:267
+msgid "Agility:"
+msgstr "Okretnost:"
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:268
+msgid "Vitality:"
+msgstr "Vitalnost:"
 
-#: ../src/game.cpp:368
-#, fuzzy
-msgid "The connection to the server was lost."
-msgstr "Veza s poslužiteljem je bila izgubljena, program će se sada zatvoriti"
+#: src/net/tmwa/charserverhandler.cpp:269
+msgid "Intelligence:"
+msgstr "Inteligencija:"
 
-#: ../src/gui/changeemaildialog.cpp:141
-#, fuzzy
-msgid "The email address entries mismatch."
-msgstr "Nova E-mail Adresa već postoji."
+#: src/net/tmwa/charserverhandler.cpp:270
+msgid "Dexterity:"
+msgstr "Spretnost:"
 
-#: ../src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "Nova E-mail Adresa već postoji."
+#: src/net/tmwa/charserverhandler.cpp:271
+msgid "Luck:"
+msgstr "Sreća:"
 
-#: ../src/gui/changeemaildialog.cpp:127
+#: src/net/tmwa/chathandler.cpp:87
 #, fuzzy, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "Korisni�ko ime mora biti dugo najmanje %d znakova."
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Å apat nije mogao biti poslan, korisnik je offline."
 
-#: ../src/gui/changeemaildialog.cpp:134
+#: src/net/tmwa/chathandler.cpp:96
 #, fuzzy, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "Korisni�ko ime mora biti kraće od %d znakova."
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Å apat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: ../src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
+#: src/net/tmwa/chathandler.cpp:230
+#, fuzzy
+msgid "MVP player."
+msgstr "Igra�"
+
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Kanali nisu podržani!"
+
+#: src/net/tmwa/gamehandler.cpp:88
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "Lozinka mora biti duga najmanje %d znakova."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Game"
+msgstr "Ime"
 
-#: ../src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "Lozinka mora biti kraća od %d znakova."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Zahtjev za Trgovanje"
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "Lozinka mora biti duga najmanje %d znakova."
+msgid "Strength %+d"
+msgstr "Snaga %+d"
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "Lozinka mora biti kraća od %d znakova."
+msgid "Agility %+d"
+msgstr "Okretnost %+d"
 
-#: ../src/gui/register.cpp:166
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "Korisni�ko ime mora biti dugo najmanje %d znakova."
+msgid "Vitality %+d"
+msgstr "Vitalnost %+d"
 
-#: ../src/gui/register.cpp:174
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "Korisni�ko ime mora biti kraće od %d znakova."
+msgid "Intelligence %+d"
+msgstr "Inteligencija %+d"
 
-#: ../src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Spretnost %+d"
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
+msgstr "Sreća %+d"
+
+#: src/net/tmwa/generalhandler.cpp:132
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Autentikacija nije uspjela"
+
+#: src/net/tmwa/generalhandler.cpp:135
+#, fuzzy
+msgid "No servers available."
+msgstr "Nema dostupnih poslužitelji"
+
+#: src/net/tmwa/generalhandler.cpp:139
+#, fuzzy
+msgid "Someone else is trying to use this account."
+msgstr "Netko drugi pokušava korištiti ovaj ra�un"
+
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Ovaj korisni�ki ra�un je već prijavljen"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:81
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Ova naredba postavlja temu za <message>."
+msgid "Speed hack detected."
+msgstr "Otkrit brzi hack"
 
-#: ../src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr ""
+#: src/net/tmwa/generalhandler.cpp:148
+#, fuzzy
+msgid "Duplicated login."
+msgstr "Dvostruka prijava"
 
-#: ../src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr ""
+#: src/net/tmwa/generalhandler.cpp:151
+#, fuzzy
+msgid "Unknown connection error."
+msgstr "Nepoznata pogreška veze"
 
-#: ../src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
+#: src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
 msgstr ""
-"Ova naredba mijenja politiku korištenja zajedni�kih predmete u partiji."
 
-#: ../src/commandhandler.cpp:275
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Ova naredba postavlja temu za <message>."
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Snaga"
 
-#: ../src/commandhandler.cpp:229
-msgid "This command clears the chat log of previous chat."
-msgstr "Ova naredba briše chat log prethodnog chata."
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Okretnost"
 
-#: ../src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "Ova naredba zatvara trenutnu karticu za Å¡aptaje."
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Vitalnost"
 
-#: ../src/commandhandler.cpp:280
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Ove naredbe kreira novu partiju zvanu <party-name>."
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Inteligencija"
 
-#: ../src/commandhandler.cpp:210
-msgid "This command displays a list of all commands available."
-msgstr "Ova naredba prikazuje listu svih raspoloživih naredbi."
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Spretnost"
 
-#: ../src/commandhandler.cpp:213
-msgid "This command displays help on <command>."
-msgstr "Ova naredba prikazuje pomoć pri <naredba>."
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Sreća"
 
-#: ../src/commandhandler.cpp:324
-msgid "This command displays the name of the current map."
-msgstr "Ova naredba prikazuje naziv trenutne karte."
+#: src/net/tmwa/generalhandler.cpp:238
+#, fuzzy
+msgid "Defense"
+msgstr "Obrana:"
 
-#: ../src/commandhandler.cpp:329
-msgid "This command displays the number of players currently online."
-msgstr "Ova naredba prikazuje broj igra�a trenutno online."
+#: src/net/tmwa/generalhandler.cpp:239
+#, fuzzy
+msgid "M.Attack"
+msgstr "M.Napad:"
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr ""
+#: src/net/tmwa/generalhandler.cpp:240
+#, fuzzy
+msgid "M.Defense"
+msgstr "M.Obrana:"
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr ""
+#: src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Preciznost:"
 
-#: ../src/commandhandler.cpp:313
-msgid "This command displays the return toggle status."
-msgstr ""
+#: src/net/tmwa/generalhandler.cpp:242
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% Izbjegavanje:"
 
-#: ../src/commandhandler.cpp:302
-msgid "This command finishes a recording session."
-msgstr "Ova naredba završava sesiju snimanja."
+#: src/net/tmwa/generalhandler.cpp:243
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "Kriti�ni Udarac"
 
-#: ../src/commandhandler.cpp:292
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Ceh"
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Prikaži ovu pomoć."
 
-#: ../src/commandhandler.cpp:234
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Ova naredba prikazuje broj igra�a trenutno online."
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Pozovite igra�e na vašu partiju"
 
-#: ../src/gui/widgets/whispertab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr "Ova naredba prikazuje broj igra�a trenutno online."
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Napustite partiju u kojoj ste"
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Ova naredba poziva <nick> na partiju sa vama."
+#: src/net/tmwa/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Å utnite nekog iz partije u kojoj ste"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Naredba: /invite <nick>"
+
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Ova naredba poziva <nick> na partiju sa vama."
 
-#: ../src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Ova naredba napušta trenutni kanal."
-
-#: ../src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Ova naredba �ini <nadimak> operatorom kanala."
-
-#: ../src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Ova naredba napravi da <nick> napusti kanal."
-
-#: ../src/commandhandler.cpp:240
-msgid "This command makes you enter <channel>."
-msgstr "Ova naredba vas unaša u <channel>."
-
-#: ../src/commandhandler.cpp:223
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Ova naredba šalje poruku <msg> svim igra�ima trenutno online."
-
-#: ../src/commandhandler.cpp:258
-msgid "This command sends the text <message> to <nick>."
-msgstr "Ova naredba Å¡alje tekst <message> za <nick>."
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Naredba: /leave"
 
-#: ../src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
+#: src/net/tmwa/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
 msgstr "Ova naredba postavlja temu za <message>."
 
-#: ../src/commandhandler.cpp:307
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-
-#: ../src/commandhandler.cpp:246
-msgid "This command shows a list of all channels."
-msgstr "Ova naredba prikazuje listu svih kanala."
-
-#: ../src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Ova naredba prikazuje korisnike u ovom kanalu."
+#: src/net/tmwa/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Ime partije nedostaje."
 
-#: ../src/commandhandler.cpp:299
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "Ova naredba zapo�inje snimanje chat log-a u datoteku <filename>."
+#: src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
+msgstr ""
 
-#: ../src/commandhandler.cpp:318
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:95
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Ova naredba zapo�inje snimanje chat log-a u datoteku <filename>."
+msgid "User is now part of your guild."
+msgstr "%s je sada �lan vaše partije."
 
-#: ../src/commandhandler.cpp:251
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Ova naredba govori drugima da vi (radite) <msg>."
+#: src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
+msgstr ""
 
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
+#: src/net/tmwa/guildhandler.cpp:316
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: ../src/commandhandler.cpp:266
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
 msgstr ""
-"Ova naredba pokušava napraviti karticu za šaptanje između vas i <nick>."
 
-#: ../src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "Ovako izgleda boja"
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Partija"
 
-#: ../src/net/tmwa/loginhandler.cpp:179
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "Ovo korisni�ko ime je već zauzeto"
+#: src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Pozovite igra�e na vašu partiju"
 
-#: ../src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Sićušno"
+#: src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Napustite partiju u kojoj ste"
 
-#: ../src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "Za:"
+#: src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Å utnite nekog iz partije u kojoj ste"
 
-#: ../src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
+#: src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Tema: %s"
+#: src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Trgovanje"
+#: src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr ""
 
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Otkazano trgovanje."
+#: src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Naredba: /item <policy>"
 
-#: ../src/net/tmwa/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Trgovanje otkazano zbog nepoznatih razloga."
+#: src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+"Ova naredba mijenja politiku korištenja zajedni�kih predmete u partiji."
 
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Trgovanje je završeno."
+#: src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Neuspjela razmjena!"
+#: src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Naredba: /item"
 
-#: ../src/net/tmwa/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Trgovanje s %s otkazano."
+#: src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:83
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "Trgovanje s %s"
+#: src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Naredba: /exp <policy>"
 
-#: ../src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Trgovanje: Vi"
+#: src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Trgujte: Vi i %s"
+#: src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Trgovanje nije moguće. Lik ne postoji."
+#: src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Naredba: /exp"
 
-#: ../src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Trgovanje nije moguće. Trgova�ki partner je predaleko."
+#: src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
 
-#: ../src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Trgovanje s %s"
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Dijeljenje predmeta je omogućeno.moguće."
 
-#: ../src/gui/setup_video.cpp:477
-#, fuzzy
-msgid "Transparency disabled"
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
 msgstr "Dijeljenje predmeta je onemogućeno."
 
-#: ../src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
-msgstr ""
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "Dijeljenje predmeta nije moguće."
 
-#: ../src/localplayer.cpp:1251
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
-msgid "Tried to pick up nonexistent item."
-msgstr "Neuspješno korištenje predmeta."
+msgid "Item sharing unknown."
+msgstr "Dijeljenje predmeta je omogućeno.moguće."
 
-#: ../src/commandhandler.cpp:335
-msgid "Type /help for a list of commands."
-msgstr "Upišite /help za listu svih naredbi."
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr ""
 
-#: ../src/gui/changeemaildialog.cpp:51
-#, fuzzy
-msgid "Type new email address twice:"
-msgstr "Utipkajte Novu Email Adresu dvaput:"
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:63
-#, fuzzy
-msgid "Type new password twice:"
-msgstr "Utipkajte Novu Lozinku dvaput:"
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:71
-#, fuzzy
-msgid "Type:"
-msgstr "Tip: "
+#: src/net/tmwa/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
+msgstr ""
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Ne može se kupiti"
+#: src/net/tmwa/inventoryhandler.cpp:285
+msgid "Failed to use item."
+msgstr "Neuspješno korištenje predmeta."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Nije moguće opremiti."
 
-#: ../src/net/tmwa/network.cpp:345
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Nije moguće prodati."
-
-#: ../src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Nije moguće prodati."
-
-#: ../src/net/tmwa/inventoryhandler.cpp:418
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:90
-#, fuzzy
-msgid "Unassign"
-msgstr "Dodijeli"
-
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
-msgid "Unequip"
-msgstr "Skini opremu"
-
-#: ../src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "Skini opremu"
-
-#: ../src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr ""
-
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr ""
+#: src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Ra�un nije pronađen. Molimo, ponovno se prijavite."
 
-#: ../src/net/net.cpp:145
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Nepoznat Tip Predmeta"
+msgid "New password too short."
+msgstr "Nova lozinka je prekratka"
 
-#: ../src/net/manaserv/chathandler.cpp:327
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
-msgid "Unknown channel event."
-msgstr "Nepoznata naredba."
+msgid "Unregistered ID."
+msgstr "Neregistriran ID"
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Nepoznata greška"
-
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
-msgid "Unknown command."
-msgstr "Nepoznata naredba."
+msgid "Wrong password."
+msgstr "Pogrešna lozinka"
 
-#: ../src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
-msgid "Unknown connection error."
-msgstr "Nepoznata pogreška veze"
-
-#: ../src/net/manaserv/charhandler.cpp:208
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Nepoznata greška"
+msgid "Account expired."
+msgstr "Ra�un je istekao"
 
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
-msgid "Unknown error."
-msgstr "Nepoznata greška"
+msgid "Rejected from server."
+msgstr "Odbijeno od poslužitelja"
 
-#: ../src/net/tmwa/guildhandler.cpp:315
-msgid "Unknown guild invite response."
+#: src/net/tmwa/loginhandler.cpp:168
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
-msgid "Unknown invite response for %s."
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Nepoznati predmet"
+#: src/net/tmwa/loginhandler.cpp:179
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Ovo korisni�ko ime je već zauzeto"
 
-#: ../src/localplayer.cpp:1258
-msgid "Unknown problem picking up item."
+#: src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Odjavi"
-
-#: ../src/client.cpp:926
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
-msgid "Unregister Successful"
-msgstr "Odjavi"
+msgid "Unable to resolve host \""
+msgstr "Nije moguće prodati."
 
-#: ../src/net/tmwa/loginhandler.cpp:156
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
-msgid "Unregistered ID."
-msgstr "Neregistriran ID"
+msgid "Connection to server terminated. "
+msgstr "Spajanje na poslužitelja karti..."
 
-#: ../src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Gore"
+#: src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Nije se mogla napraviti partija."
 
-#: ../src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Ažuriranje"
+#: src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Partija je uspješno kreirana."
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
-msgid "Use"
-msgstr "Upotrijebi"
+#: src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s je već �lan partije."
 
-#: ../src/net/tmwa/guildhandler.cpp:305
-#, fuzzy
-msgid "User is now part of your guild."
+#: src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s je odbio vašu pozivnicu."
+
+#: src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
 msgstr "%s je sada �lan vaše partije."
 
-#: ../src/net/tmwa/guildhandler.cpp:300
-msgid "User rejected guild invite."
+#: src/net/tmwa/partyhandler.cpp:131
+#, c-format
+msgid "Unknown invite response for %s."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Korisni�ko ime već postoji"
-
-#: ../src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Slika"
+#: src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Napustili ste partiju."
 
-#: ../src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Vidljiva imena"
+#: src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s je napustio/la vašu partiju."
 
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Vitalnost"
+#: src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Nepoznati �lan pokušava reći: %s"
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
+#: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Vitality %+d"
-msgstr "Vitalnost %+d"
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Vitalnost:"
+#: src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
+msgstr ""
 
-#: ../src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "ÄŒekanje servera"
+#: src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s nije u vašoj partiji!"
 
-#: ../src/gui/serverdialog.cpp:448
-#, fuzzy
-msgid "Waiting for server..."
-msgstr "ÄŒekanje servera"
+#: src/net/tmwa/playerhandler.cpp:100
+msgid "Insert coin to continue."
+msgstr "Ubacite žeton za nastavak."
 
-#: ../src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "Skok nije uspio..."
+#: src/net/tmwa/playerhandler.cpp:118
+msgid "You're not dead yet. You're just resting."
+msgstr "Niste još mrtvi. Samo se odmarate."
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "Žao nam je obavijestiti vas da je vaš lik je bio ubijen u borbi."
+#: src/net/tmwa/playerhandler.cpp:119
+msgid "You are no more."
+msgstr "Nema vas više."
 
-#: ../src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:120
+msgid "You have ceased to be."
+msgstr "Prestali ste postojati."
 
-#: ../src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Težina:"
+#: src/net/tmwa/playerhandler.cpp:121
+msgid "You've expired and gone to meet your maker."
+msgstr "Istekao vam je rok i otišli ste upoznati svog stvoritelja."
 
-#: ../src/gui/itempopup.cpp:126
-#, fuzzy, c-format
-msgid "Weight: %s"
-msgstr "Težina: "
+#: src/net/tmwa/playerhandler.cpp:122
+msgid "You're a stiff."
+msgstr "Uko�ili ste se."
 
-#: ../src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "Kad ignorira:"
+#: src/net/tmwa/playerhandler.cpp:123
+msgid "Bereft of life, you rest in peace."
+msgstr "Lišeni života, po�ivate u miru."
 
-#: ../src/gui/popupmenu.cpp:91
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "Å apat"
+#: src/net/tmwa/playerhandler.cpp:124
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "Da niste bili toliko animirani sad bi podizali tratin�ice."
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Å apat nije mogao biti poslan, ignorirani ste od strane korisnika."
+#: src/net/tmwa/playerhandler.cpp:125
+msgid "Your metabolic processes are now history."
+msgstr "Vaši metaboli�ki procesi su sad povijest."
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "Å apat nije mogao biti poslan, korisnik je offline."
+#: src/net/tmwa/playerhandler.cpp:126
+msgid "You're off the twig."
+msgstr "Pali ste s gran�ice."
 
-#: ../src/gui/chat.cpp:452
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Å aptaj prema %s: %s"
+#: src/net/tmwa/playerhandler.cpp:127
+msgid "You've kicked the bucket."
+msgstr "Vi ste šutirali sić."
 
-#: ../src/gui/socialwindow.cpp:158
-#, c-format
-msgid "Who would you like to invite to guild %s?"
+#: src/net/tmwa/playerhandler.cpp:128
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:237
-#, c-format
-msgid "Who would you like to invite to party %s?"
+#: src/net/tmwa/playerhandler.cpp:130
+msgid "You are an ex-player."
+msgstr "Vi ste bivši igra�."
+
+#: src/net/tmwa/playerhandler.cpp:131
+msgid "You're pining for the fjords."
 msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Snaga volje:"
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
+msgid "Message"
+msgstr "Poruka"
 
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "Snaga Volje %+d"
+#: src/net/tmwa/playerhandler.cpp:247
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Nosite više od pola svoje težine. Niste u mogućnosti kako bi povratili "
+"zdravlje."
 
-#: ../src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Pogrešan magi�ni_simbol"
+#: src/net/tmwa/playerhandler.cpp:313
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Pokupili ste "
 
-#: ../src/net/tmwa/loginhandler.cpp:159
-#, fuzzy
-msgid "Wrong password."
-msgstr "Pogrešna lozinka"
+#: src/net/tmwa/playerhandler.cpp:348
+msgid "Cannot raise skill!"
+msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Pogrešno korisni�ko ime ili lozinka"
+#: src/net/tmwa/playerhandler.cpp:488
+msgid "Equip arrows first."
+msgstr "Prvo se opremite strijelama."
 
-#: ../src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Pogrešno korisni�ko ime, lozinka ili email adresa"
+#: src/net/tmwa/specialhandler.cpp:144
+msgid "Trade failed!"
+msgstr "Neuspjela razmjena!"
 
-#: ../src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Da"
+#: src/net/tmwa/specialhandler.cpp:147
+msgid "Emote failed!"
+msgstr "Neuspjelo korištenje emotea!"
 
-#: ../src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Umrli ste"
+#: src/net/tmwa/specialhandler.cpp:150
+msgid "Sit failed!"
+msgstr "Neuspjelo sjedanje!"
 
-#: ../src/net/tmwa/playerhandler.cpp:139
-msgid "You are an ex-player."
-msgstr "Vi ste bivši igra�."
+#: src/net/tmwa/specialhandler.cpp:153
+msgid "Chat creating failed!"
+msgstr "Neuspjelo stvaranje lika!"
 
-#: ../src/net/tmwa/playerhandler.cpp:257
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Nosite više od pola svoje težine. Niste u mogućnosti kako bi povratili "
-"zdravlje."
+#: src/net/tmwa/specialhandler.cpp:156
+msgid "Could not join party!"
+msgstr "Neuspjelo priklju�ivanje družini!"
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Vi ste mrtvi."
+#: src/net/tmwa/specialhandler.cpp:159
+msgid "Cannot shout!"
+msgstr "Neuspjelo vikanje!"
 
-#: ../src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Nema vas više."
+#: src/net/tmwa/specialhandler.cpp:168
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Još nisi dosegao/la dovoljno visok nivo!"
 
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Niste više tako živi."
+#: src/net/tmwa/specialhandler.cpp:171
+msgid "Insufficient HP!"
+msgstr "Nedovoljno zdravlja!"
 
-#: ../src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:174
+msgid "Insufficient SP!"
+msgstr "Nedovoljno SP-a!"
+
+#: src/net/tmwa/specialhandler.cpp:177
+msgid "You have no memos!"
+msgstr "Nemaš podsjetnika!"
 
-#: ../src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Ne možeš to u�initi sad!"
 
-#: ../src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:183
+msgid "Seems you need more money... ;-)"
+msgstr "Čini se da trebate više novca... ;-)"
+
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Ne možeš koristiti tu vještinu s tim oružjem!"
 
-#: ../src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "Nemate dovoljno novca."
+#: src/net/tmwa/specialhandler.cpp:189
+msgid "You need another red gem!"
+msgstr "Trebaš još jedan crveni dragulj!"
 
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
-#, fuzzy, c-format
-msgid "You get %s"
-msgstr "Vi dobijete %s."
+#: src/net/tmwa/specialhandler.cpp:192
+msgid "You need another blue gem!"
+msgstr "Trebaš još jedan plavi dragulj!"
 
-#: ../src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "Daješ:"
+#: src/net/tmwa/specialhandler.cpp:195
+msgid "You're carrying to much to do this!"
+msgstr "Nosiš previše predmeta da bi u�inio to!"
 
-#: ../src/gui/socialwindow.cpp:592
-#, fuzzy, c-format
-msgid "You have been invited to join the %s party."
-msgstr "%s vas je pozvao/la da se pridružite %s partiji."
+#: src/net/tmwa/specialhandler.cpp:198
+msgid "Huh? What's that?"
+msgstr "Ha? Å to je to?"
 
-#: ../src/gui/socialwindow.cpp:588
-#, fuzzy
-msgid "You have been invited you to join a party."
-msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
+#: src/net/tmwa/specialhandler.cpp:207
+msgid "Warp failed..."
+msgstr "Skok nije uspio..."
 
-#: ../src/net/tmwa/loginhandler.cpp:168
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:210
+msgid "Could not steal anything..."
+msgstr "Krađa nije uspjela..."
 
-#: ../src/net/tmwa/loginhandler.cpp:172
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:213
+msgid "Poison had no effect..."
+msgstr "Otrov nije uspio..."
 
-#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Prestali ste postojati."
+#: src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Trgovanje nije moguće. Trgova�ki partner je predaleko."
 
-#: ../src/net/tmwa/partyhandler.cpp:241
-msgid "You have left the party."
-msgstr "Napustili ste partiju."
+#: src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Trgovanje nije moguće. Lik ne postoji."
 
-#: ../src/net/tmwa/specialhandler.cpp:180
-msgid "You have no memos!"
-msgstr "Nemaš podsjetnika!"
+#: src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Trgovanje otkazano zbog nepoznatih razloga."
 
-#: ../src/net/tmwa/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Još nisi dosegao/la dovoljno visok nivo!"
+#: src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Trgujte: Vi i %s"
 
-#: ../src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Trgovanje s %s otkazano."
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
+#: src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "Trebaš još jedan plavi dragulj!"
-
-#: ../src/net/tmwa/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "Trebaš još jedan crveni dragulj!"
+#: src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Neuspješno dodavanje predmeta. Trgovinski partner je preopterećen."
 
-#: ../src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
+#: src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
+"Neuspješno dodavanje predmeta. Trgovinski partner nema slobodnog prostora."
 
-#: ../src/localplayer.cpp:1276
-#, fuzzy, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Pokupili ste %s [@@%d|%s@@]."
-msgstr[1] "Pokupili ste %s [@@%d|%s@@]."
+#: src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Neuspješno dodavanje predmeta, iz nepoznatog razloga."
 
-#: ../src/net/tmwa/playerhandler.cpp:344
-#, fuzzy, c-format
-msgid "You picked up %s."
-msgstr "Pokupili ste "
+#: src/playerrelations.cpp:310
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|Potpuno ignoriraj %s@@"
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
-"Uprskali ste opet, odbacite svoje tijelo u kanalizaciju i nabavite novo."
 
-#: ../src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "Uko�ili ste se."
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "Napad %+d"
 
-#: ../src/net/tmwa/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "Nosiš previše predmeta da bi u�inio to!"
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "Obrana %+d"
 
-#: ../src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "Niste još mrtvi. Samo se odmarate."
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "Zdravlje %+d"
 
-#: ../src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
-msgstr "Pali ste s gran�ice."
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
+msgstr "Mana %+d"
 
-#: ../src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr ""
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Nepoznati predmet"
 
-#: ../src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "Istekao vam je rok i otišli ste upoznati svog stvoritelja."
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "neimenovano"
 
-#: ../src/net/tmwa/playerhandler.cpp:136
-msgid "You've kicked the bucket."
-msgstr "Vi ste šutirali sić."
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: ../src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr ""
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: ../src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
-msgstr ""
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: ../src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "Vaši metaboli�ki procesi su sad povijest."
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Novac: %d"
 
-#: ../src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Ime mora imati barem 4 znaka."
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Zadatak:"
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Nivo: %d"
 
-#: ../src/gui/setup_video.cpp:233
-msgid "as particle"
-msgstr "kao �estica"
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "Pristup odbijen"
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "visoko"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Nepoznata greška pri odabiru lika"
 
-#: ../src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "u chat-u"
+#~ msgid "Willpower:"
+#~ msgstr "Snaga volje:"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "nisko"
+#~ msgid "Willpower %+d"
+#~ msgstr "Snaga Volje %+d"
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr ""
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Snaga volje:"
 
-#: ../src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "max"
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "Server je pun"
 
-#: ../src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "srednje"
+#~ msgid "Text Shadow"
+#~ msgstr "Sjena Teksta"
 
-#: ../src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "isklju�eno"
+#~ msgid "Text Outline"
+#~ msgstr "Obris Teksta"
 
-#: ../src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr ""
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Progress Bar Oznake"
 
-#: ../src/gui/serverdialog.cpp:558
-#, c-format
-msgid "requires v%s"
-msgstr ""
+#~ msgid "Background"
+#~ msgstr "Pozadina"
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
-msgid "unnamed"
-msgstr "neimenovano"
+#~ msgid "Highlight"
+#~ msgstr "Istakni"
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " ne može biti stvoren, ali ne postoji! Izlaz."
+#~ msgid "Tab Highlight"
+#~ msgstr "Istakni Karticu"
 
-#~ msgid " host: "
-#~ msgstr " domaćin: "
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Preskup predmet"
 
-#~ msgid " video mode: "
-#~ msgstr " video na�in: "
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Predmet je opremljen"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Refleks:"
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Alias od napravi"
+#~ msgid "Player"
+#~ msgstr "Igra�"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 HP Bar"
+#~ msgid "Whisper"
+#~ msgstr "Å apat"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 HP Bar"
+#~ msgid "Is"
+#~ msgstr "Je"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "2 Ru�no Oružje"
+#~ msgid "Server"
+#~ msgstr "Server"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 HP Bar"
+#~ msgid "Hyperlink"
+#~ msgstr "Hiperveza"
 
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Šutni igra�a@@"
+#~ msgid "Being"
+#~ msgstr "Biće"
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Napadni %s@@"
+#~ msgid "Other Players' Names"
+#~ msgstr "Imena Drugih Igra�a"
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Otkaži@@"
+#~ msgid "Own Name"
+#~ msgstr "Vlastito Ime"
 
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|Zanemari %s@@"
+#~ msgid "GM Names"
+#~ msgstr "GM Imena"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Ispusti@@"
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
 
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|Ignoriraj %s@@"
+#~ msgid "Monsters"
+#~ msgstr "Čudovišta"
 
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|Pokupi %s@@"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Nepoznat Tip Predmeta"
 
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|Preuzmi@@"
+#~ msgid "Generics"
+#~ msgstr "Generi�ki"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Razdvoji@@"
+#~ msgid "Hats"
+#~ msgstr "Šeširi"
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Pohrani@@"
+#~ msgid "Shirts"
+#~ msgstr "Košulje"
 
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Razmijeni se s %s@@"
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "1 Ru�no Oružje"
 
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Prestani Ignorirati %s@@"
+#~ msgid "Pants"
+#~ msgstr "Hla�e"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Opremi@@"
+#~ msgid "Shoes"
+#~ msgstr "Cipele"
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Skini opremu@@"
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "1 Ru�no Oružje"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Upotrijebi@@"
+#~ msgid "Shields"
+#~ msgstr "Å titovi"
 
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Pristup odbijen"
+#~ msgid "Rings"
+#~ msgstr "Prstenovi"
 
-#~ msgid "Ammo"
-#~ msgstr "Streljivo"
+#~ msgid "Necklaces"
+#~ msgstr "Ogrlice"
 
 #~ msgid "Arms"
 #~ msgstr "Naoružanje"
 
-#~ msgid "Attack:"
-#~ msgstr "Napad:"
+#~ msgid "Ammo"
+#~ msgstr "Streljivo"
 
-#~ msgid "Axe"
-#~ msgstr "Sjekira"
+#~ msgid "Particle Effects"
+#~ msgstr "Efekti ÄŒestica"
 
-#~ msgid "Background"
-#~ msgstr "Pozadina"
+#~ msgid "Pickup Notification"
+#~ msgstr "Obavijest Sakupljanja"
 
-#~ msgid "Bow"
-#~ msgstr "Luk"
+#~ msgid "Exp Notification"
+#~ msgstr "Exp Obavijest"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Igra� pogađa Čudovište"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Čudovište pogađa Igra�a"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Kriti�ni Udarac"
+
+#~ msgid "Misses"
+#~ msgstr "Promašaji"
+
+#~ msgid "HP Bar"
+#~ msgstr "HP Bar"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 HP Bar"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 HP Bar"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 HP Bar"
+
+#~ msgid "no"
+#~ msgstr "ne"
 
 #~ msgid "Buddy"
 #~ msgstr "Prijatelj"
@@ -3873,226 +3777,212 @@ msgstr "neimenovano"
 #~ msgid "Buddy List"
 #~ msgstr "Lista Prijatelja"
 
-#~ msgid "Buddys"
-#~ msgstr "Prijatelji"
+#~ msgid "Description: %s"
+#~ msgstr "Opis: %s"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Baci Testnu ÄŒaroliju 1"
+#~ msgid "Effect: %s"
+#~ msgstr "U�inak: %s"
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Baci Testnu ÄŒaroliju 2"
+#~ msgid "Previous"
+#~ msgstr "Prethodni"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Baci Testnu ÄŒaroliju 3"
+#~ msgid "New"
+#~ msgstr "Novi"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Naredba: /new <ime-partije>"
+#~ msgid "Job Level: %d"
+#~ msgstr "Nivo poslaČ %d"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Spajanje na poslužitelja korisnika..."
+#~ msgid "Present: "
+#~ msgstr "Pokloniti: "
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Spajanje na poslužitelja likova..."
+#~ msgid "Quit Guild"
+#~ msgstr "Napusti Ceh"
 
-#~ msgid "Cost"
-#~ msgstr "Cijena"
+#~ msgid "Ok"
+#~ msgstr "U redu"
 
-#~ msgid "Craft"
-#~ msgstr "Zanat"
+#~ msgid "Recent:"
+#~ msgstr "Novije:"
 
-#~ msgid "Crafts"
-#~ msgstr "Obrti"
+#~ msgid "Magic"
+#~ msgstr "Magija"
 
-#~ msgid "Description: %s"
-#~ msgstr "Opis: %s"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Baci Testnu ÄŒaroliju 1"
 
-#~ msgid "Effect: %s"
-#~ msgstr "U�inak: %s"
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Baci Testnu ÄŒaroliju 2"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Neuspješno prebacivanje na "
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Baci Testnu ÄŒaroliju 3"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#~ msgid "2 Handed Weapons"
+#~ msgstr "2 Ru�no Oružje"
 
-#~ msgid "Generics"
-#~ msgstr "Generi�ki"
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Razmijeni se s %s@@"
 
-#~ msgid "Guilds"
-#~ msgstr "Cehovi"
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Napadni %s@@"
 
-#~ msgid "HP Bar"
-#~ msgstr "HP Bar"
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Zanemari %s@@"
 
-#~ msgid "Hats"
-#~ msgstr "Šeširi"
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignoriraj %s@@"
 
-#~ msgid "Highlight"
-#~ msgstr "Istakni"
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Prestani Ignorirati %s@@"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Hiperveza"
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Šutni igra�a@@"
 
-#~ msgid "Is"
-#~ msgstr "Je"
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Otkaži@@"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Predmet je opremljen"
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Pokupi %s@@"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Preskup predmet"
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Skini opremu@@"
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Nivo poslaČ %d"
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Opremi@@"
 
-#~ msgid "Knife"
-#~ msgstr "Nož"
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Upotrijebi@@"
 
-#~ msgid "Mace"
-#~ msgstr "Buzdovan"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Ispusti@@"
 
-#~ msgid "Magic"
-#~ msgstr "Magija"
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Razdvoji@@"
 
-#~ msgid "Max level"
-#~ msgstr "Najviša razina"
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Pohrani@@"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Vještina Misterije"
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Preuzmi@@"
 
-#~ msgid "Necklaces"
-#~ msgstr "Ogrlice"
+#~ msgid "Select Server"
+#~ msgstr "Odaberi poslužitelj"
 
-#~ msgid "New"
-#~ msgstr "Novi"
+#~ msgid "Failed to switch to "
+#~ msgstr "Neuspješno prebacivanje na "
 
-#~ msgid "Ok"
-#~ msgstr "U redu"
+#~ msgid "windowed"
+#~ msgstr "uokvireno"
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "1 Ru�no Oružje"
+#~ msgid "fullscreen"
+#~ msgstr "cijeli ekran"
 
-#~ msgid "Pants"
-#~ msgstr "Hla�e"
+#~ msgid "Mystery Skill"
+#~ msgstr "Vještina Misterije"
 
-#~ msgid "Party Window"
-#~ msgstr "Prozor za Partiju"
+#~ msgid "Weapons"
+#~ msgstr "Oružje"
 
-#~ msgid "Player"
-#~ msgstr "Igra�"
+#~ msgid "Crafts"
+#~ msgstr "Obrti"
 
-#~ msgid "Present: "
-#~ msgstr "Pokloniti: "
+#~ msgid "Stats"
+#~ msgstr "Statistika"
 
-#~ msgid "Previous"
-#~ msgstr "Prethodni"
+#~ msgid "Total"
+#~ msgstr "Total"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Progress Bar Oznake"
+#~ msgid "Cost"
+#~ msgstr "Cijena"
 
-#~ msgid "Quit Guild"
-#~ msgstr "Napusti Ceh"
+#~ msgid "Attack:"
+#~ msgstr "Napad:"
 
-#~ msgid "Recent:"
-#~ msgstr "Novije:"
+#~ msgid "% Reflex:"
+#~ msgstr "% Refleks:"
 
 #~ msgid "Remaining Status Points: %d"
 #~ msgstr "Preostali Bodovi Statusa: %d"
 
-#~ msgid "Rings"
-#~ msgstr "Prstenovi"
+#~ msgid "Max level"
+#~ msgstr "Najviša razina"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Brzina klizanja"
+#~ msgid "curl error "
+#~ msgstr "curl greška "
 
-#~ msgid "Scroll radius"
-#~ msgstr "Polumjer klizanja"
+#~ msgid " host: "
+#~ msgstr " domaćin: "
 
-#~ msgid "Select Server"
-#~ msgstr "Odaberi poslužitelj"
+#~ msgid "Guilds"
+#~ msgstr "Cehovi"
 
-#~ msgid "Server"
-#~ msgstr "Server"
+#~ msgid "Buddys"
+#~ msgstr "Prijatelji"
 
-#~ msgid "Shields"
-#~ msgstr "Å titovi"
+#~ msgid "Party Window"
+#~ msgstr "Prozor za Partiju"
 
-#~ msgid "Shirts"
-#~ msgstr "Košulje"
+#~ msgid "Unarmed"
+#~ msgstr "Razoružan"
 
-#~ msgid "Shoes"
-#~ msgstr "Cipele"
+#~ msgid "Knife"
+#~ msgstr "Nož"
 
-#~ msgid "Shooting"
-#~ msgstr "Gađanje"
+#~ msgid "Sword"
+#~ msgstr "Ma�"
 
 #~ msgid "Staff"
 #~ msgstr "Motka"
 
-#~ msgid "Stats"
-#~ msgstr "Statistika"
-
-#~ msgid "Sword"
-#~ msgstr "Ma�"
-
-#~ msgid "Tab Highlight"
-#~ msgstr "Istakni Karticu"
+#~ msgid "Whip"
+#~ msgstr "Bi�"
 
-#~ msgid "Text Outline"
-#~ msgstr "Obris Teksta"
+#~ msgid "Bow"
+#~ msgstr "Luk"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Sjena Teksta"
+#~ msgid "Shooting"
+#~ msgstr "Gađanje"
 
-#~ msgid "Total"
-#~ msgstr "Total"
+#~ msgid "Mace"
+#~ msgstr "Buzdovan"
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "1 Ru�no Oružje"
+#~ msgid "Axe"
+#~ msgstr "Sjekira"
 
-#~ msgid "Unarmed"
-#~ msgstr "Razoružan"
+#~ msgid "Craft"
+#~ msgstr "Zanat"
 
 #~ msgid "Unknown Skill"
 #~ msgstr "Nepoznata Vještina"
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Nepoznata greška pri odabiru lika"
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " ne može biti stvoren, ali ne postoji! Izlaz."
 
-#~ msgid "Unnamed"
-#~ msgstr "Neimenovano"
+#~ msgid " video mode: "
+#~ msgstr " video na�in: "
 
-#~ msgid "Weapons"
-#~ msgstr "Oružje"
+#~ msgid "mana"
+#~ msgstr "mana"
 
-#~ msgid "Whip"
-#~ msgstr "Bi�"
+#~ msgid "Connecting to character server..."
+#~ msgstr "Spajanje na poslužitelja likova..."
 
-#~ msgid "Whisper"
-#~ msgstr "Å apat"
+#~ msgid "Connecting to account server..."
+#~ msgstr "Spajanje na poslužitelja korisnika..."
 
-#~ msgid "Willpower:"
-#~ msgstr "Snaga volje:"
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Alias od napravi"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Naredba: /new <ime-partije>"
 
 #~ msgid "a"
 #~ msgstr "jedan"
 
-#~ msgid "curl error "
-#~ msgstr "curl greška "
-
-#~ msgid "fullscreen"
-#~ msgstr "cijeli ekran"
-
-#~ msgid "mana"
-#~ msgstr "mana"
+#~ msgid "Unnamed"
+#~ msgstr "Neimenovano"
 
-#~ msgid "no"
-#~ msgstr "ne"
+#~ msgid "Scroll radius"
+#~ msgstr "Polumjer klizanja"
 
-#~ msgid "windowed"
-#~ msgstr "uokvireno"
+#~ msgid "Scroll laziness"
+#~ msgstr "Brzina klizanja"
diff --git a/po/hu.po b/po/hu.po
index ff6aeda5..c17e89a4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-07 19:52+0000\n"
 "Last-Translator: Tatsukichi <artit91@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -19,415 +19,365 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/npcdialog.cpp:183
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Következő"
-
-#: ../src/main.cpp:60
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : OpenGL kikapcsolása erre az időszakra"
-
-#: ../src/main.cpp:58
-#, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir : Könyvtár használata gyökérkönyvtárként"
-
-#: ../src/main.cpp:52
-#, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : A frissítési szerver kijelölésére használjuk"
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Beállítások"
 
-#: ../src/main.cpp:46
+#: src/client.cpp:679
 #, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Konfigurációs fájl használata"
+msgid "Connecting to server"
+msgstr "Csatlakozás a térkép szerverhez...."
 
-#: ../src/main.cpp:53
+#: src/client.cpp:706
 #, fuzzy
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default : Válaszd ki az alapértelmezett szervert és karaktert"
+msgid "Logging in"
+msgstr "Belépés"
 
-#: ../src/main.cpp:57
-#, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir : Könyvtár használata gyökérkönyvtárként"
+#: src/client.cpp:739
+msgid "Entering game world"
+msgstr ""
 
-#: ../src/main.cpp:48
+#: src/client.cpp:804
 #, fuzzy
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Bejelentkezés ezzel a jelszóval"
+msgid "Requesting characters"
+msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: ../src/main.cpp:47
+#: src/client.cpp:833
 #, fuzzy
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Bejelentkezés ezzel a felhasználónévvel"
+msgid "Connecting to the game server"
+msgstr "Csatlakozás a térkép szerverhez...."
 
-#: ../src/main.cpp:49
+#: src/client.cpp:843
 #, fuzzy
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Bejelentkezés ezzel a karakterrel"
+msgid "Changing game servers"
+msgstr "Szerver"
 
-#: ../src/main.cpp:56
-#, fuzzy
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Könyvtár ahonnan betöltöd a játékot"
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Hiba"
 
-#: ../src/main.cpp:45
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help : Megmutatja ezt a súgót"
+#: src/client.cpp:888
+msgid "Requesting registration details"
+msgstr ""
 
-#: ../src/main.cpp:51
+#: src/client.cpp:915
 #, fuzzy
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Bejelentkezési port"
+msgid "Password Change"
+msgstr "Jelszó:"
 
-#: ../src/main.cpp:50
-#, fuzzy
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Szerver neve vagy IP címe"
+#: src/client.cpp:916
+msgid "Password changed successfully!"
+msgstr ""
 
-#: ../src/main.cpp:55
+#: src/client.cpp:935
 #, fuzzy
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update :  Frissítés átugrása"
+msgid "Email Change"
+msgstr "Változtatás"
 
-#: ../src/main.cpp:44
+#: src/client.cpp:936
 #, fuzzy
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Megmutatja a verziót"
-
-#: ../src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1 Erősen ajánljuk, hogy"
-
-#: ../src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1 A frissítési folyamat befejezetlen"
+msgid "Email changed successfully!"
+msgstr "A tag előléptetése sikeres."
 
-#: ../src/gui/updatewindow.cpp:421
+#: src/client.cpp:956
 #, fuzzy
-msgid "##1  you try again later."
-msgstr "##1 próbáld meg később"
-
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "Találati esély (%):"
-
-#: ../src/net/tmwa/generalhandler.cpp:230
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "Kritikális ütéskor"
-
-#: ../src/net/tmwa/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "Kitérés (%):"
-
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr ""
+msgid "Unregister Successful"
+msgstr "Regisztráció megszüntetése"
 
-#: ../src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
+#: src/client.cpp:957
+msgid "Farewell, come back any time..."
 msgstr ""
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:291
+#: src/client.cpp:1281
 #, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s csatlakozott a csapathoz."
-
-#: ../src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s behívott %s csapatába."
+msgid "Invalid update host: %s"
+msgstr "Helytelen frissítési kiszolgáló: "
 
-#: ../src/gui/socialwindow.cpp:561
-#, fuzzy, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s behívott %s csapatába."
+#: src/client.cpp:1315 src/client.cpp:1321
+msgid "Error creating updates directory!"
+msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: ../src/gui/socialwindow.cpp:600
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s a csapatába hívott."
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
+msgid "Unknown command."
+msgstr "Ismeretlen parancs."
 
-#: ../src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#: src/commandhandler.cpp:160
+msgid "-- Help --"
+msgstr "-- Segítség --"
 
-#: ../src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s elhagyta a csapatot."
+#: src/commandhandler.cpp:161
+msgid "/help > Display this help"
+msgstr "/help > Megmutatja ezt a segítséget"
 
-#: ../src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#: src/commandhandler.cpp:163
+msgid "/where > Display map name"
+msgstr "/where > Megmutatja a térkép nevét"
 
-#: ../src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s eleve tagja a csapatnak."
+#: src/commandhandler.cpp:164
+msgid "/who > Display number of online users"
+msgstr "/who > Megmutatja az online felhasználókat"
 
-#: ../src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s nincs a csapatodban!"
+#: src/commandhandler.cpp:165
+msgid "/me > Tell something about yourself"
+msgstr "/me > Mondasz valamit magadról"
 
-#: ../src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s mostantól a csapatod tagja."
+#: src/commandhandler.cpp:167
+msgid "/clear > Clears this window"
+msgstr "/clear > Letörli ezt az ablakot"
 
-#: ../src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s csatlakozott a csapathoz."
+#: src/commandhandler.cpp:169
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Privát üzenetet küld egy felhasználónak"
 
-#: ../src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
+#: src/commandhandler.cpp:170
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > msg megfelelője"
 
-#: ../src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s visszautasította a csapatba hívást."
+#: src/commandhandler.cpp:171
+msgid "/w > Alias of msg"
+msgstr "/w > msg megfelelője"
 
-#: ../src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s visszautasította a csapatba hívást."
+#: src/commandhandler.cpp:172
+msgid "/query > Makes a tab for private messages with another user"
+msgstr "/query > Fület hoz létre privát beszélgetéshez"
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s üzletelni akar veled. Te akarsz vele?"
+#: src/commandhandler.cpp:174
+msgid "/q > Alias of query"
+msgstr "/q > query megfelelője"
 
-#: ../src/gui/widgets/chattab.cpp:152
-#, fuzzy, c-format
-msgid "%s whispers: %s"
-msgstr "%s mondja: "
+#: src/commandhandler.cpp:176
+msgid "/ignore > ignore a player"
+msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
-msgid "(empty)"
+#: src/commandhandler.cpp:177
+msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: ../src/commandhandler.cpp:222
-msgid "*** only available to a GM ***"
-msgstr "*** csak GM-nek elérhető ***"
+#: src/commandhandler.cpp:179
+msgid "/list > Display all public channels"
+msgstr "/list > Publikus csatornák listázása"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
-msgid "+"
-msgstr ""
+#: src/commandhandler.cpp:180
+msgid "/join > Join or create a channel"
+msgstr "/join > Csatornához kapcsolódás/csatornát létrehoz"
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
-msgid "-"
-msgstr ""
+#: src/commandhandler.cpp:182
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Új csapat létrehozása"
 
-#: ../src/commandhandler.cpp:166
-msgid "-- Help --"
-msgstr "-- Segítség --"
+#: src/commandhandler.cpp:183
+msgid "/party > Invite a user to party"
+msgstr "/party > Felhasználó csapatba hívása"
 
-#: ../src/commandhandler.cpp:201
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Globális üzenet (csak GM)"
+#: src/commandhandler.cpp:185
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Beszélgetés rögzítése külső fájlba"
 
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
+#: src/commandhandler.cpp:187
+msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
+"/toggle > Választható, hogy üres <enter> kell e az input panel bezárásához"
 
-#: ../src/commandhandler.cpp:173
-msgid "/clear > Clears this window"
-msgstr "/clear > Letörli ezt az ablakot"
-
-#: ../src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Bezárja a privát fület."
+#: src/commandhandler.cpp:189
+msgid "/present > Get list of players present (sent to chat log, if logging)"
+msgstr "/present > \"Hallható\" játékosok kilistázása"
 
-#: ../src/commandhandler.cpp:191
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Új csapat létrehozása"
+#: src/commandhandler.cpp:192
+msgid "/announce > Global announcement (GM only)"
+msgstr "/announce > Globális üzenet (csak GM)"
 
-#: ../src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Tapasztalat elosztását nézhetjük/átállíthatjuk vele"
+#: src/commandhandler.cpp:196
+msgid "For more information, type /help <command>."
+msgstr "További információhoz gépeld be a /help <parancsnév> parancsot."
 
-#: ../src/commandhandler.cpp:167
-msgid "/help > Display this help"
-msgstr "/help > Megmutatja ezt a segítséget"
+#: src/commandhandler.cpp:200
+msgid "Command: /help"
+msgstr "Parancs: /help"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Megmutatja ezt a súgót."
+#: src/commandhandler.cpp:201
+msgid "This command displays a list of all commands available."
+msgstr "Ez a parancs az elérhető parancsokat listázza."
 
-#: ../src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
-msgstr ""
+#: src/commandhandler.cpp:203
+msgid "Command: /help <command>"
+msgstr "Parancs: /help <parancsnév>"
 
-#: ../src/commandhandler.cpp:185
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:204
+msgid "This command displays help on <command>."
 msgstr ""
+"Ez a parancs segítséget nyújt a <parancsnév> alatt megadott parancshoz."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Játékos meghívása a csapatba"
+#: src/commandhandler.cpp:212
+msgid "Command: /announce <msg>"
+msgstr "Parancs: /announce <üzenet>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Játékos meghívása a csapatba"
+#: src/commandhandler.cpp:213
+msgid "*** only available to a GM ***"
+msgstr "*** csak GM-nek elérhető ***"
 
-#: ../src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > Tárgyak elosztását nézhetjük/átállíthatjuk vele"
+#: src/commandhandler.cpp:214
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+"Ez a parancs az <üzenet>-en belül megadott szöveget elküldi az összes "
+"elérhető játékosnak."
 
-#: ../src/commandhandler.cpp:189
-msgid "/join > Join or create a channel"
-msgstr "/join > Csatornához kapcsolódás/csatornát létrehoz"
+#: src/commandhandler.cpp:219
+msgid "Command: /clear"
+msgstr "Parancs: /clear"
 
-#: ../src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Felhasználó kirúgása a csatornából"
+#: src/commandhandler.cpp:220
+msgid "This command clears the chat log of previous chat."
+msgstr "Törli a beszélgetés panel tartalmát."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
+#: src/commandhandler.cpp:224
 #, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Valaki kirúgása a csapatból"
-
-#: ../src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Valaki kirúgása a csapatból"
+msgid "Command: /ignore <player>"
+msgstr "Parancs: /item <szabály>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
+#: src/commandhandler.cpp:225
 #, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Jelenlegi csapat elhagyása"
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Ez a parancs megmutatja az online játékosok számát."
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Jelenlegi csapat elhagyása"
+#: src/commandhandler.cpp:230
+msgid "Command: /join <channel>"
+msgstr "Parancs: /join <csatorna>"
 
-#: ../src/commandhandler.cpp:188
-msgid "/list > Display all public channels"
-msgstr "/list > Publikus csatornák listázása"
+#: src/commandhandler.cpp:231
+msgid "This command makes you enter <channel>."
+msgstr "Belépsz a <csatorna> helyen megadott beszélgetési csatornába."
 
-#: ../src/commandhandler.cpp:171
-msgid "/me > Tell something about yourself"
-msgstr "/me > Mondasz valamit magadról"
+#: src/commandhandler.cpp:232
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Ha a <csatorna> helyen megadott csatorna nem létezik, létrehozod."
 
-#: ../src/commandhandler.cpp:175
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Privát üzenetet küld egy felhasználónak"
+#: src/commandhandler.cpp:236
+msgid "Command: /list"
+msgstr "Parancs: /list"
 
-#: ../src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Felhasználóból csatorna operátort képez."
+#: src/commandhandler.cpp:237
+msgid "This command shows a list of all channels."
+msgstr "Kilistázza az összes csatornát."
 
-#: ../src/commandhandler.cpp:192
-msgid "/party > Invite a user to party"
-msgstr "/party > Felhasználó csapatba hívása"
+#: src/commandhandler.cpp:241
+msgid "Command: /me <message>"
+msgstr "Parancs: /me <üzenet>"
 
-#: ../src/commandhandler.cpp:198
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr "/present > \"Hallható\" játékosok kilistázása"
+#: src/commandhandler.cpp:242
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Ezzel a paranccsal az állapotodat jelzed. Megjelenés: Név <üzenet>"
 
-#: ../src/commandhandler.cpp:180
-msgid "/q > Alias of query"
-msgstr "/q > query megfelelője"
+#: src/commandhandler.cpp:246
+msgid "Command: /msg <nick> <message>"
+msgstr "Parancs: /msg <név> <üzenet>"
 
-#: ../src/commandhandler.cpp:178
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Fület hoz létre privát beszélgetéshez"
+#: src/commandhandler.cpp:247
+msgid "Command: /whisper <nick> <message>"
+msgstr "Parancs: /whisper <név> <üzenet>"
 
-#: ../src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Csatorna elhagyása"
+#: src/commandhandler.cpp:248
+msgid "Command: /w <nick> <message>"
+msgstr "Parancs: /w <név> <üzenet>"
 
-#: ../src/commandhandler.cpp:194
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Beszélgetés rögzítése külső fájlba"
+#: src/commandhandler.cpp:249
+msgid "This command sends the text <message> to <nick>."
+msgstr ""
+"Ez a parancs elküldi az <üzenet> szövegét a <név> alatt megadott nevű "
+"játékosnak."
 
-#: ../src/commandhandler.cpp:196
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
-"/toggle > Választható, hogy üres <enter> kell e az input panel bezárásához"
+"Ha a <név> alatt megadott név szóközt tartalmaz idézőjelbe kell tenni. (\")."
 
-#: ../src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Beállítja egy csatorna témáját."
+#: src/commandhandler.cpp:255
+msgid "Command: /query <nick>"
+msgstr "Parancs: /query <név>"
 
-#: ../src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+#: src/commandhandler.cpp:256
+msgid "Command: /q <nick>"
+msgstr "Parancs: /q <név>"
 
-#: ../src/commandhandler.cpp:186
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:257
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
+"Ez a parancs egy új fület nyit beszélgetéseidhez a <név> alatt megadott nevű "
+"játékossal."
 
-#: ../src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Kilistázza az aktuális csatorna felhasználóit"
+#: src/commandhandler.cpp:262
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Parancs: /create <csapatnév>"
 
-#: ../src/commandhandler.cpp:177
-msgid "/w > Alias of msg"
-msgstr "/w > msg megfelelője"
+#: src/commandhandler.cpp:263
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr ""
+"Ezek a parancsok új csapatot hoznak létre a <csapatnév> alatt megadott néven."
 
-#: ../src/commandhandler.cpp:169
-msgid "/where > Display map name"
-msgstr "/where > Megmutatja a térkép nevét"
+#: src/commandhandler.cpp:267
+msgid "Command: /party <nick>"
+msgstr "Parancs: /party <név>"
 
-#: ../src/commandhandler.cpp:176
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > msg megfelelője"
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Ez a parancs csapatba hívja a <név> alatt megadott nevű játékost."
 
-#: ../src/commandhandler.cpp:170
-msgid "/who > Display number of online users"
-msgstr "/who > Megmutatja az online felhasználókat"
+#: src/commandhandler.cpp:274
+msgid "Command: /present"
+msgstr "Parancs: /present"
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
-msgid "<"
+#: src/commandhandler.cpp:275
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
 msgstr ""
+"Ez a parancs megmutatja a \"hallható\" játékosok nevét és fájlba is rögzíti, "
+"ha éppen rögzítjük a beszélgetést."
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+#: src/commandhandler.cpp:281
+msgid "Command: /record <filename>"
+msgstr "parancs: /record <fájlnév>"
+
+#: src/commandhandler.cpp:282
+msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
-"<szabály> lehet \"1\", \"yes\", \"true\" a tapasztalat megosztásához, vagy "
-"\"0\", \"no\", \"false\" a tapasztalat megosztásának kikapcsolásához."
+"Ez a parancs elkezdi felvenni a beszélgetést a <fájlnév> alatt megadott "
+"fájlba."
+
+#: src/commandhandler.cpp:284
+msgid "Command: /record"
+msgstr "Parancs: /record"
+
+#: src/commandhandler.cpp:285
+msgid "This command finishes a recording session."
+msgstr "Befejezi a beszélgetés rögzítését."
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/commandhandler.cpp:289
+msgid "Command: /toggle <state>"
+msgstr "Parancs: /toggle <állás>"
+
+#: src/commandhandler.cpp:290
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
-msgstr ""
-"<szabály> lehet \"1\", \"yes\", \"true\" a tárgyak megosztásához, vagy "
-"\"0\", \"no\", \"false\" a tárgyak megosztásának kikapcsolásához."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr "Ez a parancs beállítja az enter billentyű használatát a játékban."
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -435,3202 +385,2907 @@ msgstr ""
 "<állás> lehet \"1\", \"yes\", \"true\" ha ki akarod kapcsolni a chat input "
 "automatikus eltűnését, \"0\", \"no\", \"false\"  ha nem."
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ""
+#: src/commandhandler.cpp:295
+msgid "Command: /toggle"
+msgstr "Parancs: /toggle"
 
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: src/commandhandler.cpp:296
+msgid "This command displays the return toggle status."
+msgstr "A /toggle jelenlegi állását mutatja meg."
 
-#: ../src/gui/socialwindow.cpp:566
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
-msgid "Accept Guild Invite"
-msgstr "Ajánlat elfogadása"
+msgid "Command: /unignore <player>"
+msgstr "Parancs: /item <szabály>"
 
-#: ../src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Ajánlat elfogadása"
+#: src/commandhandler.cpp:301
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:466
-#, fuzzy, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Csapatba hívást elfogadta %s."
+#: src/commandhandler.cpp:306
+msgid "Command: /where"
+msgstr "Parancs: /where"
 
-#: ../src/gui/socialwindow.cpp:447
-#, fuzzy, c-format
-msgid "Accepted party invite from %s."
-msgstr "Csapatba hívást elfogadta %s."
+#: src/commandhandler.cpp:307
+msgid "This command displays the name of the current map."
+msgstr "Ez a parancs megmutatja az aktuális térkép nevét."
 
-#: ../src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Kereskedési kérelmek elfogadása"
+#: src/commandhandler.cpp:311
+msgid "Command: /who"
+msgstr "Parancs: /who"
 
-#: ../src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Elfogadod a bejövő üzleti ajánlatokat."
+#: src/commandhandler.cpp:312
+msgid "This command displays the number of players currently online."
+msgstr "Ez a parancs megmutatja az online játékosok számát."
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
+#: src/commandhandler.cpp:318
+msgid "Type /help for a list of commands."
+msgstr "Parancsok listája: /help"
+
+#: src/commandhandler.cpp:384
+msgid "Cannot send empty whispers!"
+msgstr "Nem küldhetsz üres üzenetet!"
+
+#: src/commandhandler.cpp:392
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
+"Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az."
 
-#: ../src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Fiók és Karakter Menedzsment"
+#: src/commandhandler.cpp:406
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: ../src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Account banned"
-msgstr "A fiók lejárt"
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "A csapatnév hiányzik."
 
-#: ../src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Account banned."
-msgstr "A fiók lejárt"
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
+msgid "Please specify a name."
+msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:162
-#, fuzzy
-msgid "Account expired."
-msgstr "A fiók lejárt"
+#: src/commandhandler.cpp:450
+msgid "Return toggles chat."
+msgstr "Az enter megnyitja a bevitelt."
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "A fiók nem kapcsolódott. Kérlek jelentkezz be előbb."
+#: src/commandhandler.cpp:450
+msgid "Message closes chat."
+msgstr "Az üzenet bezárja a bevitelt."
 
-#: ../src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Fiók nem található. Kérem jelentkezzen be újra."
+#: src/commandhandler.cpp:459
+msgid "Return now toggles chat."
+msgstr "Az enter mostantól megnyitja a bevitelt."
 
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
-msgstr "Fiók: %s"
+#: src/commandhandler.cpp:463
+msgid "Message now closes chat."
+msgstr "Az üzenet mostantól bezárja a bevitelt."
 
-#: ../src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Hozzáad"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:171
-#, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|Neve hozzáadása a csevegéshez@@"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
+#: src/commandhandler.cpp:515
+msgid "Player already ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:522
 #, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Hozzáadás a chat-hez@@"
+msgid "Player successfully ignored!"
+msgstr "Csapat létrehozása sikeres."
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Mozgékonyság"
+#: src/commandhandler.cpp:524
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "Mozgékonyság %+d"
+#: src/commandhandler.cpp:539
+msgid "Player wasn't ignored!"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Mozgékonyság:"
+#: src/commandhandler.cpp:544
+msgid "Player no longer ignored!"
+msgstr ""
 
-#: ../src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Üzlet elfogadása"
+#: src/commandhandler.cpp:546
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: ../src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Elfogadva. Vár..."
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"."
 
-#: ../src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "Mind"
+#: src/game.cpp:172
+msgid "General"
+msgstr "�ltalános"
 
-#: ../src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Üzletelés engedélyezése"
+#: src/game.cpp:342
+#, fuzzy
+msgid "Screenshot saved as "
+msgstr "Képernyőt mentettük a ~/ helyre"
 
-#: ../src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Privát engedélyezése"
+#: src/game.cpp:347
+msgid "Saving screenshot failed!"
+msgstr "Hiba a képernyő mentése során!"
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
+#: src/game.cpp:378
 #, fuzzy
-msgid "Already logged in."
-msgstr "Már be van jelentkezve"
+msgid "The connection to the server was lost."
+msgstr "A kapcsolat megszakadt a szerverrel, a program most kilép."
 
-#: ../src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Már rögzítesz."
+#: src/game.cpp:382
+msgid "Network Error"
+msgstr "Hálózati hiba"
 
-#: ../src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Környezeti effektek"
+#: src/game.cpp:721
+msgid "Ignoring incoming trade requests"
+msgstr "Kereskedési kérelmek elutasítása"
 
-#: ../src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "Környezeti effektek"
+#: src/game.cpp:726
+msgid "Accepting incoming trade requests"
+msgstr "Kereskedési kérelmek elfogadása"
+
+#: src/game.cpp:954
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Nem lehet betölteni a térképet"
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/game.cpp:955
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Egy ismeretlen csapattárs mondja: %s"
+msgid "Error while loading %s"
+msgstr "Hiba %s betöltése közben"
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Megöltek."
+#: src/gui/beingpopup.cpp:76
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Csapat (%s)"
 
-#: ../src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Alkalmaz"
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Vétel"
 
-#: ../src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "�r: %s / Teljes: %s"
 
-#: ../src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
+msgid "+"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Biztos hogy ki akarod törölni ezt a karaktert?"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
+msgid "-"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:168
-#, fuzzy, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Biztos, hogy ki szeretne lépni?"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Kilépés"
 
-#: ../src/gui/socialwindow.cpp:247
-#, fuzzy, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Biztos, hogy ki szeretne lépni?"
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
+msgid "Max"
+msgstr "Max."
 
-#: ../src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Hozzárendel"
+#: src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Ãœzlet"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Támadás"
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Eladás"
+
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Mégse"
+
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Email cím módosírása"
 
-#: ../src/resources/itemdb.cpp:53
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
-msgid "Attack %+d"
-msgstr "Támadás %+d"
+msgid "Account: %s"
+msgstr "Fiók: %s"
+
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
+msgstr "�rd be az új Email címet kétszer:"
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: src/gui/changeemaildialog.cpp:127
 #, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Támadás %+d"
+msgid "The new email address needs to be at least %d characters long."
+msgstr "A felhasználónévnek legalább %d karakternek kell lennie."
 
-#: ../src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "A látogatottság rögzíve lessz."
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "A felhasználónévnek legfeljebb %d karakternek kell lennie."
 
-#: ../src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Audió"
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "Az új email cím már foglalt."
 
-#: ../src/net/tmwa/generalhandler.cpp:129
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
+msgid "Change Password"
+msgstr "Jelszó módosítása"
+
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Jelszó:"
+
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
-msgid "Authentication failed."
-msgstr "Azonosítás sikertelen"
+msgid "Type new password twice:"
+msgstr "�rd be az új jelszót kétszer:"
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:100
+#: src/gui/changepassworddialog.cpp:116
 #, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|Felvenni %s-t a barátok közé@@"
+msgid "The new password needs to be at least %d characters long."
+msgstr "A jelszónak legalább %d karakter hosszúnak kell lennie."
 
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Nevek"
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
 
-#: ../src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Megfosztottak az életedtől. Nyugodj békében."
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
 
-#: ../src/playerrelations.cpp:342
-msgid "Blink name"
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Karakter létrehozása"
+
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Név:"
+
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:138
-#, fuzzy
-msgid "Blue:"
-msgstr "Kék: "
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Buborékok nevekkel"
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
+msgstr "Haj szín:"
 
-#: ../src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Buborékok, nincs név."
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
+msgstr "Haj stílus:"
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Vétel"
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
+msgid "Create"
+msgstr "Létrehozás"
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Kalibrálás"
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "Férfi"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Mégse"
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "NÅ‘"
 
-#: ../src/commandhandler.cpp:422
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az."
+msgid "Please distribute %d points"
+msgstr "Kérlek oszd el a pontjaidat (%d van még)"
 
-#: ../src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "A nevednek minimum 4 karakternek kell lennie."
 
-#: ../src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
+msgstr "Karakter statok rendben"
 
-#: ../src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "Nem tudsz üres üzenetet küldeni!"
+#: src/gui/charcreatedialog.cpp:256
+#, c-format
+msgid "Please remove %d points"
+msgstr "Kérlek távolíts el %d pontot"
 
-#: ../src/commandhandler.cpp:401
-msgid "Cannot send empty whispers!"
-msgstr "Nem küldhetsz üres üzenetet!"
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Karakter törlésének megerősítése"
 
-#: ../src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Nem tudsz ordítani!"
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "Biztos hogy ki akarod törölni ezt a karaktert?"
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "Nem használhatod ez a nevet."
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr "Fiók és Karakter Menedzsment"
 
-#: ../src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Változtatás"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Regisztráció megszüntetése"
 
-#: ../src/gui/charselectdialog.cpp:150
+#: src/gui/charselectdialog.cpp:150
 #, fuzzy
 msgid "Change Email"
 msgstr "Email cím módosírása"
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Email cím módosírása"
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Törlés"
 
-#: ../src/gui/worldselectdialog.cpp:76
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
-msgid "Change Login"
-msgstr "Változtatás"
+msgid "Choose"
+msgstr "Bezár"
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Jelszó módosítása"
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
+msgid "(empty)"
+msgstr ""
 
-#: ../src/gui/login.cpp:62
-#, fuzzy
-msgid "Change Server"
-msgstr "Szerver"
+#: src/gui/chat.cpp:88
+msgid "Chat"
+msgstr "Chat"
 
-#: ../src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "A változások érvénybe lépéséhez töltsön be egy új térképet."
+#: src/gui/chat.cpp:311
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
+msgstr "%d játékos van a közeledben."
 
-#: ../src/client.cpp:813
-#, fuzzy
-msgid "Changing game servers"
-msgstr "Szerver"
+#: src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "A látogatottság rögzíve lessz."
 
-#: ../src/gui/setup_video.cpp:460
-#, fuzzy
-msgid "Changing to OpenGL"
-msgstr "OpenGL átállítása"
+#: src/gui/chat.cpp:493
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Üzenet %s számára: %s"
 
-#: ../src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
-msgstr "A csatorna operátor parancsai: /kick /op"
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Igen"
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "A csatornák le vannak tiltva!"
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Nem"
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Karakter törölve."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: ../src/gui/statuswindow.cpp:238
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
 #, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Karakter statok rendben"
+msgid "Music: %s"
+msgstr "Téma: %s"
 
-#: ../src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Karakter statok rendben"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Név: %s"
 
-#: ../src/net/manaserv/charhandler.cpp:143
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "A felhasználónév foglalt"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "Minitérkép Ablak"
 
-#: ../src/net/manaserv/charhandler.cpp:155
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Karakter statok rendben"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:158
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Karakter statok rendben"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Effektek"
 
-#: ../src/gui/chat.cpp:87
-msgid "Chat"
-msgstr "Chat"
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Effektek részletessége"
 
-#: ../src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Chat Ablak"
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Környezeti effektek"
 
-#: ../src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Beszélgetés létrehozása sikertelen."
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Felszerelés"
 
-#: ../src/gui/charselectdialog.cpp:380
-#, fuzzy
-msgid "Choose"
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
+msgid "Unequip"
+msgstr "Nem használ"
+
+#: src/gui/help.cpp:37
+msgid "Help"
+msgstr "Súgó"
+
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
+msgid "Close"
 msgstr "Bezár"
 
-#: ../src/gui/worldselectdialog.cpp:77
-#, fuzzy
-msgid "Choose World"
-msgstr "Válassz szervert"
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Táska"
 
-#: ../src/gui/serverdialog.cpp:196
-#, fuzzy
-msgid "Choose Your Server"
-msgstr "Válassz szervert"
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Raktár"
 
-#: ../src/gui/socialwindow.cpp:544
-#, fuzzy
-msgid "Choose your guild's name."
-msgstr "Válassz szervert"
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Hely:"
 
-#: ../src/gui/socialwindow.cpp:630
-#, fuzzy
-msgid "Choose your party's name."
-msgstr "Válassz szervert"
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
+msgid "Equip"
+msgstr "Használ"
 
-#: ../src/gui/npcdialog.cpp:98
-msgid "Clear log"
-msgstr ""
+#: src/gui/inventorywindow.cpp:88
+msgid "Use"
+msgstr "Bevet"
 
-#: ../src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
-msgid "Client version is too old."
-msgstr "A kliens verziója túl régi"
-
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
-msgid "Close"
-msgstr "Bezár"
+msgid "Drop..."
+msgstr "Eldob"
 
-#: ../src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Színek"
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
+msgid "Split"
+msgstr "Felosztás"
 
-#: ../src/commandhandler.cpp:221
-msgid "Command: /announce <msg>"
-msgstr "Parancs: /announce <üzenet>"
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
 
-#: ../src/commandhandler.cpp:274
-#, fuzzy
-msgid "Command: /away"
-msgstr "Parancs: /who"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
+msgstr "Súly:"
 
-#: ../src/commandhandler.cpp:271
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Parancs: /w <név> <üzenet>"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Raktároz"
 
-#: ../src/commandhandler.cpp:228
-msgid "Command: /clear"
-msgstr "Parancs: /clear"
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Magához vesz"
 
-#: ../src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Parancs: /close"
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
+msgid "Drop"
+msgstr "Eldob"
 
-#: ../src/commandhandler.cpp:279
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Parancs: /create <csapatnév>"
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
+msgid "OK"
+msgstr "Ok"
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Parancs: /exp"
+#: src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Mind"
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Parancs: /exp <szabály>"
+#: src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
 
-#: ../src/commandhandler.cpp:209
-msgid "Command: /help"
-msgstr "Parancs: /help"
+#: src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Válaszd ki mennyit akarsz eldobni."
 
-#: ../src/commandhandler.cpp:212
-msgid "Command: /help <command>"
-msgstr "Parancs: /help <parancsnév>"
+#: src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Válaszd ki a raktározandó mennyiséget."
 
-#: ../src/gui/widgets/whispertab.cpp:88
-#, fuzzy
-msgid "Command: /ignore"
-msgstr "Parancs: /item"
+#: src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Válaszd ki mennyit veszel magadhoz."
 
-#: ../src/commandhandler.cpp:233
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Parancs: /item <szabály>"
+#: src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Válaszd ki az elosztandó mennyiséget."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Parancs: /invite <név>"
+#: src/gui/itempopup.cpp:137
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Súly: "
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Parancs: /item"
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
+msgid "Login"
+msgstr "Belépés"
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Parancs: /item <szabály>"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Remember username"
+msgstr "Felhasználónév megjegyzése"
 
-#: ../src/commandhandler.cpp:239
-msgid "Command: /join <channel>"
-msgstr "Parancs: /join <csatorna>"
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "Regisztráció"
 
-#: ../src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Parancs: /kick <név>"
+#: src/gui/login.cpp:62
+#, fuzzy
+msgid "Change Server"
+msgstr "Szerver"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Parancs: /leave"
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Tárgy megosztás tiltva."
 
-#: ../src/commandhandler.cpp:245
-msgid "Command: /list"
-msgstr "Parancs: /list"
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
 
-#: ../src/commandhandler.cpp:250
-msgid "Command: /me <message>"
-msgstr "Parancs: /me <üzenet>"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Térkép"
 
-#: ../src/commandhandler.cpp:255
-msgid "Command: /msg <nick> <message>"
-msgstr "Parancs: /msg <név> <üzenet>"
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Parancs: /op <név>"
+#: src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Várakozás a szerverre"
 
-#: ../src/commandhandler.cpp:284
-msgid "Command: /party <nick>"
-msgstr "Parancs: /party <név>"
+#: src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Következő"
 
-#: ../src/commandhandler.cpp:291
-msgid "Command: /present"
-msgstr "Parancs: /present"
+#: src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Küldés"
 
-#: ../src/commandhandler.cpp:265
-msgid "Command: /q <nick>"
-msgstr "Parancs: /q <név>"
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "Gépjátékos"
 
-#: ../src/commandhandler.cpp:264
-msgid "Command: /query <nick>"
-msgstr "Parancs: /query <név>"
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Parancs: /quit"
+#: src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Alaphelyzet"
 
-#: ../src/commandhandler.cpp:301
-msgid "Command: /record"
-msgstr "Parancs: /record"
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:208
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Következő"
 
-#: ../src/commandhandler.cpp:298
-msgid "Command: /record <filename>"
-msgstr "parancs: /record <fájlnév>"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Cél:"
 
-#: ../src/commandhandler.cpp:312
-msgid "Command: /toggle"
-msgstr "Parancs: /toggle"
+#: src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Küldés"
 
-#: ../src/commandhandler.cpp:306
-msgid "Command: /toggle <state>"
-msgstr "Parancs: /toggle <állás>"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "A levél elküldése sikertelen. A feladó, vagy a címzett nem található."
 
-#: ../src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Parancs: /topic <téma>"
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
+#: src/gui/outfitwindow.cpp:70
 #, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Parancs: /item <szabály>"
+msgid "Unequip first"
+msgstr "Nem használ"
 
-#: ../src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Parancs: /users"
+#: src/gui/popupmenu.cpp:83
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Üzlet Te és %s között"
 
-#: ../src/commandhandler.cpp:257
-msgid "Command: /w <nick> <message>"
-msgstr "Parancs: /w <név> <üzenet>"
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Támadás %+d"
 
-#: ../src/commandhandler.cpp:323
-msgid "Command: /where"
-msgstr "Parancs: /where"
+#: src/gui/popupmenu.cpp:91
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Privát üzenet"
 
-#: ../src/commandhandler.cpp:256
-msgid "Command: /whisper <nick> <message>"
-msgstr "Parancs: /whisper <név> <üzenet>"
+#: src/gui/popupmenu.cpp:100
+#, fuzzy, c-format
+msgid "Befriend %s"
+msgstr "@@friend|Felvenni %s-t a barátok közé@@"
 
-#: ../src/commandhandler.cpp:328
-msgid "Command: /who"
-msgstr "Parancs: /who"
+#: src/gui/popupmenu.cpp:105
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Semmibevett"
 
-#: ../src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Kész"
+#: src/gui/popupmenu.cpp:108
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Tiltott"
 
-#: ../src/playerrelations.cpp:312
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Teljesen letiltod %s-t@@"
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:117
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Teljesen letiltod %s-t@@"
 
-#: ../src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Karakter törlésének megerősítése"
-
-#: ../src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Megerősítés:"
-
-#: ../src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Megerősítve. Vár..."
+#: src/gui/popupmenu.cpp:130
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
+msgstr "@@guild|%s meghívása a klánodba@@"
 
-#: ../src/keyboardconfig.cpp:184
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr "�llítsd át, vagy a játék érdekesen fog viselkedni."
+msgid "Invite %s to join your party"
+msgstr "@@party|%s meghívása a csapatodba@@"
 
-#: ../src/gui/serverdialog.cpp:233
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
-msgid "Connect"
-msgstr "Csatlakozás…"
+msgid "Kick player"
+msgstr "Kirúgás sikertelen!"
 
-#: ../src/client.cpp:655
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Csatlakozás a térkép szerverhez...."
+#: src/gui/popupmenu.cpp:150
+#, fuzzy, c-format
+msgid "Talk to %s"
+msgstr "@@talk|Privát Te és %s között@@"
 
-#: ../src/client.cpp:803
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
-msgid "Connecting to the game server"
-msgstr "Csatlakozás a térkép szerverhez...."
-
-#: ../src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Csatlakozás…"
+msgid "Kick monster"
+msgstr "@@admin-kick|Szörny kirúgása@@"
 
-#: ../src/net/tmwa/network.cpp:414
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Csatlakozás a térkép szerverhez...."
-
-#: ../src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr ""
+msgid "Add name to chat"
+msgstr "@@name|Neve hozzáadása a csevegéshez@@"
 
-#: ../src/gui/statuswindow.cpp:244
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Képesség pontok: %d"
+msgid "Pick up %s"
+msgstr "Felvesz"
 
-#: ../src/game.cpp:950
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
-msgid "Could Not Load Map"
-msgstr "Nem lehet betölteni a térképet"
+msgid "Add to chat"
+msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: ../src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "Nem tudtad a csapatot létrehozni."
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Szerver változtatása"
 
-#: ../src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
-msgstr ""
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Karakter változtatása"
 
-#: ../src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Nem tudsz csatlakozni a csapatba."
+#: src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Rögzítés befejezése."
 
-#: ../src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "Nem tudsz semmit ellopni..."
+#: src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Jelenleg nem rögzítesz."
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Létrehozás"
+#: src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Már rögzítesz."
 
-#: ../src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Karakter létrehozása"
+#: src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Rögzítés megkezdése..."
 
-#: ../src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Klán létrehozása"
+#: src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Sikertelen rögzítés."
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
-#, fuzzy
-msgid "Create Party"
-msgstr "Karakter létrehozása"
+#: src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Rögzítés..."
 
-#: ../src/gui/socialwindow.cpp:507
-#, fuzzy, c-format
-msgid "Creating guild called %s."
-msgstr "Hiba a klán létrehozása közben."
+#: src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Rögzítés leállítása"
 
-#: ../src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Megerősítés:"
+
+#: src/gui/register.cpp:100
+msgid "Email:"
+msgstr "Email:"
 
-#: ../src/gui/socialwindow.cpp:529
+#: src/gui/register.cpp:166
 #, c-format
-msgid "Creating party called %s."
-msgstr ""
+msgid "The username needs to be at least %d characters long."
+msgstr "A felhasználónévnek legalább %d karakternek kell lennie."
 
-#: ../src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "A felhasználónévnek legfeljebb %d karakternek kell lennie."
 
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Kritikális ütéskor"
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "A jelszónak legalább %d karakter hosszúnak kell lennie."
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+msgid "The password needs to be less than %d characters long."
+msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
 
-#: ../src/gui/serverdialog.cpp:234
-#, fuzzy
-msgid "Custom Server"
-msgstr "Egyéni kurzor"
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "A jelszavak nem egyeznek."
 
-#: ../src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "Egyéni kurzor"
+#: src/gui/serverdialog.cpp:197
+#, fuzzy
+msgid "Choose Your Server"
+msgstr "Válassz szervert"
 
-#: ../src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
-msgstr ""
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Szerver:"
 
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr ""
+#: src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Port:"
 
-#: ../src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Hibakereső Ablak"
+#: src/gui/serverdialog.cpp:208
+#, fuzzy
+msgid "Server type:"
+msgstr "Szerver:"
 
-#: ../src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Alapértelmezett"
+#: src/gui/serverdialog.cpp:229
+#, fuzzy
+msgid "Connect"
+msgstr "Csatlakozás…"
 
-#: ../src/net/tmwa/generalhandler.cpp:225
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
-msgid "Defense"
-msgstr "Fizikális védelem:"
+msgid "Custom Server"
+msgstr "Egyéni kurzor"
 
-#: ../src/resources/itemdb.cpp:54
+#: src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Kérlek írd be a szerver címét és portját egyaránt."
+
+#: src/gui/serverdialog.cpp:441
 #, c-format
-msgid "Defense %+d"
-msgstr "Védelem %+d"
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:93
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
-msgid "Delay:"
-msgstr "Várakozás "
+msgid "Waiting for server..."
+msgstr "Várakozás a szerverre"
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Törlés"
+#: src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Ügyesség"
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: src/gui/serverdialog.cpp:552
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Ügyesség %+d"
+msgid "requires v%s"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Ügyesség:"
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Hang"
 
-#: ../src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:105
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "Semmibevett"
+#: src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Audió"
 
-#: ../src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Semmibevett"
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Effektek hangereje"
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Meg akarod bánni a bűneid?"
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Zene hangereje"
 
-#: ../src/gui/setup_audio.cpp:43
-msgid "Download music"
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Nincs szöveg"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:442
-#, c-format
-msgid "Downloading server list...%2.2f%%"
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
-msgid "Drop"
-msgstr "Eldob"
+#: src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "�gy fog kinézni a felirat."
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
-#, fuzzy
-msgid "Drop..."
-msgstr "Eldob"
+#: src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Színek"
 
-#: ../src/net/tmwa/generalhandler.cpp:145
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
-msgid "Duplicated login."
-msgstr "Duplikált bejelentkezés"
+msgid "Type:"
+msgstr "Típus: "
 
-#: ../src/client.cpp:905
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Statikus"
+
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Pulzáló"
+
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Szivárvány"
+
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Színkép"
+
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
-msgid "Email Change"
-msgstr "Változtatás"
+msgid "Delay:"
+msgstr "Várakozás "
 
-#: ../src/net/manaserv/loginhandler.cpp:309
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Az email cím foglalt"
+msgid "Red:"
+msgstr "Vörös: "
 
-#: ../src/client.cpp:906
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
-msgid "Email changed successfully!"
-msgstr "A tag előléptetése sikeres."
+msgid "Green:"
+msgstr "Zöld: "
 
-#: ../src/gui/register.cpp:100
-msgid "Email:"
-msgstr "Email:"
+#: src/gui/setup_colors.cpp:139
+#, fuzzy
+msgid "Blue:"
+msgstr "Kék: "
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Hangulatjel Gyorsmenü %d"
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Alkalmaz"
 
-#: ../src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr "Hangulatjel Gyorsmenü Ablak"
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Ablakok alaphelyzetbe"
 
-#: ../src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Hangulatjel küldése sikertelen!"
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Nyomd meg a gombot a kalibrálás megkezdéséhez"
 
-#: ../src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Kalibrálás"
 
-#: ../src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr "Joystick engedélyezése"
 
-#: ../src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Üzletelés Engedélyezése/Tiltása"
-
-#: ../src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: ../src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr ""
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: ../src/client.cpp:715
-msgid "Entering game world"
-msgstr ""
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Leállít"
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
-msgid "Equip"
-msgstr "Használ"
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Mozgasd körbe"
 
-#: ../src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
-msgstr "Előbb tegyél be nyílvesszőt."
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Billentyűzet"
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Felszerelés"
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Hozzárendel"
 
-#: ../src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Felszerelés Ablak"
+#: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Hozzárendel"
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "Hiba"
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Alapértelmezett"
 
-#: ../src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Hiba a klán létrehozása közben."
+#: src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Billentyű ütközés van."
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
-msgid "Error creating updates directory!"
-msgstr "Hiba a frissítési könyvtár létrehozása közben!"
+#: src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Név"
 
-#: ../src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Parancs: /join <csatorna>"
+#: src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Kapcsolat"
 
-#: ../src/gui/serverdialog.cpp:456
-msgid "Error retreiving server list!"
-msgstr ""
+#: src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Semleges"
 
-#: ../src/game.cpp:951
-#, c-format
-msgid "Error while loading %s"
-msgstr "Hiba %s betöltése közben"
+#: src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Barát"
 
-#: ../src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "TP:"
+#: src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Semmibevett"
 
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "Tapasztalat szerzésekor"
+#: src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Tiltott"
 
-#: ../src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "TP:"
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
+msgid "???"
+msgstr "???"
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr "Tapasztalat megosztás tiltva."
+#: src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Üzletelés engedélyezése"
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr "Tapasztalat megosztás engedélyezve."
+#: src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Privát engedélyezése"
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr "A tapasztalat megosztás nem lehetséges."
+#: src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Privátok fülekbe tétele"
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
+#: src/gui/setup_players.cpp:233
 #, fuzzy
-msgid "Experience sharing unknown."
-msgstr "Tapasztalat megosztás engedélyezve."
+msgid "Show gender"
+msgstr "A név mutatása"
 
-#: ../src/gui/setup_video.cpp:238
+#: src/gui/setup_players.cpp:235
 #, fuzzy
-msgid "FPS limit:"
-msgstr "FPS Limit:"
-
-#: ../src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Ismeretlen okból a tárgy hozzáadása sikertelen."
+msgid "Enable Chat log"
+msgstr "Nem tudod eladni."
 
-#: ../src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Tárgy hozzáadása sikertelen. Az üzleti partnernek nincs elég helye."
+#: src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Játékosok"
 
-#: ../src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Tárgy hozzáadása sikertelen. Az üzleti partner túl van terhelve."
+#: src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "Ha ignorolva van:"
 
-#: ../src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
+#: src/gui/setup_video.cpp:134
+msgid "Tiny"
+msgstr "Apró"
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Nem tudod létrehozni a karaktert. Valószínű a neve használatban van."
+#: src/gui/setup_video.cpp:135
+msgid "Small"
+msgstr "Kicsi"
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "Karakter törlése sikertelen."
+#: src/gui/setup_video.cpp:136
+msgid "Medium"
+msgstr "Közepes"
 
-#: ../src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "A tag előléptetése sikertelen."
+#: src/gui/setup_video.cpp:137
+msgid "Large"
+msgstr "Nagy"
 
-#: ../src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "A levél elküldése sikertelen. A feladó, vagy a címzett nem található."
+#: src/gui/setup_video.cpp:163
+msgid "No text"
+msgstr "Nincs szöveg"
 
-#: ../src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Sikertelen rögzítés."
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Szöveg"
 
-#: ../src/gui/setup_video.cpp:434
-#, fuzzy
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
+#: src/gui/setup_video.cpp:165
+msgid "Bubbles, no names"
+msgstr "Buborékok, nincs név."
 
-#: ../src/gui/setup_video.cpp:428
-#, fuzzy
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
+#: src/gui/setup_video.cpp:166
+msgid "Bubbles with names"
+msgstr "Buborékok nevekkel"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
-msgid "Failed to use item."
-msgstr "Nem tudod bevetni a tárgyat."
+#: src/gui/setup_video.cpp:178
+msgid "off"
+msgstr "ki"
 
-#: ../src/client.cpp:927
-msgid "Farewell, come back any time..."
-msgstr ""
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
+msgid "low"
+msgstr "alacsony"
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
-msgid "Female"
-msgstr "NÅ‘"
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
+msgid "high"
+msgstr "magas"
 
-#: ../src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "Útvonal Keresése a Kurzorig"
+#: src/gui/setup_video.cpp:193
+msgid "medium"
+msgstr "közepes"
 
-#: ../src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Rögzítés befejezése."
+#: src/gui/setup_video.cpp:195
+msgid "max"
+msgstr "max."
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:217
+msgid "Full screen"
+msgstr "Teljes képernyő"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:218
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Betűméret"
+#: src/gui/setup_video.cpp:219
+msgid "Custom cursor"
+msgstr "Egyéni kurzor"
 
-#: ../src/commandhandler.cpp:205
-msgid "For more information, type /help <command>."
-msgstr "További információhoz gépeld be a /help <parancsnév> parancsot."
+#: src/gui/setup_video.cpp:221
+msgid "Visible names"
+msgstr "Látható nevek"
 
-#: ../src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Barát"
+#: src/gui/setup_video.cpp:223
+msgid "Particle effects"
+msgstr "Játékbéli effektek"
 
-#: ../src/gui/setup_video.cpp:219
-msgid "Full screen"
-msgstr "Teljes képernyő"
+#: src/gui/setup_video.cpp:225
+#, fuzzy
+msgid "Show own name"
+msgstr "A név mutatása"
 
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "GM név"
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
 
-#: ../src/net/tmwa/gamehandler.cpp:101
-#, fuzzy
-msgid "Game"
-msgstr "Név"
+#: src/gui/setup_video.cpp:227
+msgid "Show pickup notification"
+msgstr "Értesítés tárgy felvételkor"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Vége a játéknak!"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
+msgid "in chat"
+msgstr "Chat-en belül"
 
-#: ../src/game.cpp:169
-msgid "General"
-msgstr "�ltalános"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
+msgid "as particle"
+msgstr "Karakter felett"
 
-#: ../src/gui/widgets/chattab.cpp:126
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Globális bejelentés (%s) :"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "FPS limit:"
+msgstr "FPS Limit:"
 
-#: ../src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Globális bejelentés:"
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
-msgstr "Lekapcsolódtál a szerverről!"
+#: src/gui/setup_video.cpp:250
+msgid "Video"
+msgstr "Videó"
 
-#: ../src/gui/setup_colors.cpp:123
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Green:"
-msgstr "Zöld: "
+msgid "Show damage"
+msgstr "A név mutatása"
+
+#: src/gui/setup_video.cpp:258
+msgid "Overhead text"
+msgstr "Fej feletti szöveg"
 
-#: ../src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Menük áttetszősége"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Klán"
-
-#: ../src/gui/socialwindow.cpp:143
-#, fuzzy, c-format
-msgid "Guild %s quit requested."
-msgstr "Klán létrehozva."
-
-#: ../src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Klán"
+#: src/gui/setup_video.cpp:260
+msgid "Ambient FX"
+msgstr "Környezeti effektek"
 
-#: ../src/gui/socialwindow.cpp:543
+#: src/gui/setup_video.cpp:261
 #, fuzzy
-msgid "Guild Name"
-msgstr "Klán"
-
-#: ../src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Klán létrehozva."
+msgid "Particle detail"
+msgstr "Effektek részletessége"
 
-#: ../src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
-msgstr ""
+#: src/gui/setup_video.cpp:262
+msgid "Font size"
+msgstr "Betűméret"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
-msgid "Guild name is missing."
-msgstr "A csapatnév hiányzik."
+msgid "None"
+msgstr "Nem"
 
-#: ../src/gui/statuswindow.cpp:203
+#: src/gui/setup_video.cpp:426
 #, fuzzy
-msgid "HP"
-msgstr "Élet:"
-
-#: ../src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "Élet: %+d"
-
-#: ../src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "Élet:"
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
 
-#: ../src/gui/charcreatedialog.cpp:74
+#: src/gui/setup_video.cpp:432
 #, fuzzy
-msgid "Hair color:"
-msgstr "Haj szín:"
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
 
-#: ../src/gui/charcreatedialog.cpp:77
+#: src/gui/setup_video.cpp:443
 #, fuzzy
-msgid "Hair style:"
-msgstr "Haj stílus:"
+msgid "Switching to Full Screen"
+msgstr "�tállás teljes képernyőre"
 
-#: ../src/gui/help.cpp:37
-msgid "Help"
-msgstr "Súgó"
+#: src/gui/setup_video.cpp:444
+msgid "Restart needed for changes to take effect."
+msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: ../src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Súgó Ablak"
+#: src/gui/setup_video.cpp:458
+#, fuzzy
+msgid "Changing to OpenGL"
+msgstr "OpenGL átállítása"
 
-#: ../src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Ablakok Elrejtése"
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Huh? Mi volt ez?"
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Úgy látszik nem futottál túl gyorsan."
+#: src/gui/setup_video.cpp:467
+msgid "Applying change to OpenGL requires restart."
+msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: ../src/commandhandler.cpp:241
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Ha a <csatorna> helyen megadott csatorna nem létezik, létrehozod."
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Tapasztalat megosztás tiltva."
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
 msgstr ""
-"Ha a <név> alatt megadott név szóközt tartalmaz idézőjelbe kell tenni. (\")."
 
-#: ../src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "Szép vagy mikor alszol..."
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Ha te vagy az utolsó személy a csatornán, akkor kitörli."
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
+#, fuzzy
+msgid "Screen Resolution Changed"
+msgstr "A képernyő felbontása megváltozott"
 
-#: ../src/gui/popupmenu.cpp:108
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "Tiltott"
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
+msgid "Restart your client for the change to take effect."
+msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: ../src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "Ignore input 1"
+#: src/gui/setup_video.cpp:579
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "Ignore input 2"
+#: src/gui/setup_video.cpp:612
+#, fuzzy
+msgid "Particle Effect Settings Changed."
+msgstr "Effektek beállítása megváltozott."
 
-#: ../src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Tiltott"
+#: src/gui/setup_video.cpp:613
+msgid "Changes will take effect on map change."
+msgstr "A változások érvénybe lépéséhez töltsön be egy új térképet."
 
-#: ../src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Kereskedési kérelmek elutasítása"
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Képességek"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Elutasítod a bejövő üzleti ajánlatokat."
+#: src/gui/skilldialog.cpp:223
+msgid "Up"
+msgstr "Fejleszt"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Infó"
+#: src/gui/skilldialog.cpp:269
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Képesség pontok: %d"
 
-#: ../src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "Dobj be egy érmét a folytatáshoz."
+#: src/gui/skilldialog.cpp:351
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Képesség pontok: %d"
 
-#: ../src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "Kevés az életed!"
+#: src/gui/skilldialog.cpp:360
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Képességek"
 
-#: ../src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "Kimerültél."
+#: src/gui/skilldialog.cpp:442
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Szint: %d"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Intelligencia"
+#: src/gui/skilldialog.cpp:453
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Szint: %d"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
+#: src/gui/socialwindow.cpp:126
 #, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligencia %+d"
-
-#: ../src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Intelligencia:"
-
-#: ../src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
-msgstr ""
+#: src/gui/socialwindow.cpp:139
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Klán létrehozva."
 
-#: ../src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
+#: src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
+#: src/gui/socialwindow.cpp:154
+#, c-format
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: ../src/client.cpp:1244
-#, fuzzy, c-format
-msgid "Invalid update host: %s"
-msgstr "Helytelen frissítési kiszolgáló: "
-
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Táska"
-
-#: ../src/keyboardconfig.cpp:72
-msgid "Inventory Window"
-msgstr "Táska Ablak"
-
-#: ../src/localplayer.cpp:1254
-#, fuzzy
-msgid "Inventory is full."
-msgstr "A szerver tele van"
-
-#: ../src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
-msgid "Invite"
-msgstr "Felhasználó meghívása"
-
-#: ../src/gui/popupmenu.cpp:130
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|%s meghívása a klánodba@@"
+msgid "Leave Guild?"
+msgstr "Klán létrehozása"
 
-#: ../src/gui/popupmenu.cpp:134
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|%s meghívása a csapatodba@@"
-
-#: ../src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Meghívás elküldve."
-
-#: ../src/gui/socialwindow.cpp:128
-#, c-format
-msgid "Invited user %s to guild %s."
-msgstr ""
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Biztos, hogy ki szeretne lépni?"
 
-#: ../src/net/tmwa/partyhandler.cpp:335
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Felhasználó csapatba hívása"
 
-#: ../src/net/tmwa/partyhandler.cpp:340
+#: src/gui/socialwindow.cpp:218
 #, c-format
-msgid "Inviting failed, because you can't see a player called %s."
+msgid "Party %s quit requested."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Gyorsmenü %d"
-
-#: ../src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Gyorsmenü Ablak"
+#: src/gui/socialwindow.cpp:232
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Felhasználó csapatba hívása"
 
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
+#: src/gui/socialwindow.cpp:233
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
+#: src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
-msgstr ""
+#: src/gui/socialwindow.cpp:243
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Biztos, hogy ki szeretne lépni?"
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Tárgy megosztás tiltva."
+#: src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Klán létrehozása"
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Tárgy megosztás engedélyezve."
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
+#, fuzzy
+msgid "Create Party"
+msgstr "Karakter létrehozása"
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "A tárgy megosztás nem lehetséges."
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:141
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
-msgid "Item sharing unknown."
-msgstr "Tárgy megosztás engedélyezve."
+msgid "Invite"
+msgstr "Felhasználó meghívása"
 
-#: ../src/gui/statuswindow.cpp:234
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
-msgid "Job"
-msgstr "Munka:"
+msgid "Leave"
+msgstr "Nagy"
 
-#: ../src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Munka:"
+#: src/gui/socialwindow.cpp:443
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Csapatba hívást elfogadta %s."
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
-#, c-format
-msgid "Job: %d"
-msgstr "Munka: %d"
+#: src/gui/socialwindow.cpp:449
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Csapatba hívást elutasította %s."
 
-#: ../src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Csatlakoztál a csapathoz."
+#: src/gui/socialwindow.cpp:462
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Csapatba hívást elfogadta %s."
 
-#: ../src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: src/gui/socialwindow.cpp:468
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Csapatba hívást elutasította %s."
 
-#: ../src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Billentyű ütközés van."
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Billentyűzet"
+#: src/gui/socialwindow.cpp:504
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Hiba a klán létrehozása közben."
 
-#: ../src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Kirúgás sikertelen!"
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:163
+#: src/gui/socialwindow.cpp:527
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|Szörny kirúgása@@"
+msgid "Guild Name"
+msgstr "Klán"
 
-#: ../src/gui/popupmenu.cpp:141
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
-msgid "Kick player"
-msgstr "Kirúgás sikertelen!"
+msgid "Choose your guild's name."
+msgstr "Válassz szervert"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Kirúgás sikeres!"
+#: src/gui/socialwindow.cpp:554
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: ../src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Nagy"
+#: src/gui/socialwindow.cpp:559
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s behívott %s csapatába."
 
-#: ../src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
-msgid "Leave"
-msgstr "Nagy"
+msgid "Accept Guild Invite"
+msgstr "Ajánlat elfogadása"
+
+#: src/gui/socialwindow.cpp:576
+msgid "Received party request, but one already exists."
+msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: ../src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
-msgid "Leave Guild?"
-msgstr "Klán létrehozása"
+msgid "You have been invited you to join a party."
+msgstr "%s a csapatába hívott."
 
-#: ../src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
-msgstr ""
+#: src/gui/socialwindow.cpp:589
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s behívott %s csapatába."
 
-#: ../src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Szint: %d"
+#: src/gui/socialwindow.cpp:597
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s a csapatába hívott."
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/socialwindow.cpp:602
 #, c-format
-msgid "Level: %d"
-msgstr "Szint: %d"
+msgid "%s has invited you to join the %s party."
+msgstr "%s behívott %s csapatába."
 
-#: ../src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Kapcsolódási kérelem a %s nevű csatornába."
+#: src/gui/socialwindow.cpp:610
+msgid "Accept Party Invite"
+msgstr "Ajánlat elfogadása"
 
-#: ../src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Kritikális ütéskor"
+#: src/gui/socialwindow.cpp:621
+msgid "Cannot create party. You are already in a party"
+msgstr ""
 
-#: ../src/gui/userpalette.cpp:107
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "Sebzéskor"
+msgid "Party Name"
+msgstr "Csapat"
 
-#: ../src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
+#: src/gui/socialwindow.cpp:627
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Válassz szervert"
 
-#: ../src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
+msgid "Specials"
 msgstr ""
 
-#: ../src/client.cpp:682
-#, fuzzy
-msgid "Logging in"
-msgstr "Belépés"
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
+#, c-format
+msgid "Level: %d"
+msgstr "Szint: %d"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
-msgid "Login"
-msgstr "Belépés"
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
+#, c-format
+msgid "Money: %s"
+msgstr "Pénz: %s"
 
-#: ../src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#: src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "Élet:"
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Kezedbe adták a fejed."
+#: src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "TP:"
 
-#: ../src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Szerencse"
+#: src/gui/statuswindow.cpp:130
+msgid "MP:"
+msgstr "Varázserő:"
 
-#: ../src/net/tmwa/generalhandler.cpp:106
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
-msgid "Luck %+d"
-msgstr "Szerencse %+d"
+msgid "Job: %d"
+msgstr "Munka: %d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Szerencse:"
+#: src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Munka:"
 
-#: ../src/gui/skilldialog.cpp:455
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Szint: %d"
+msgid "Character points: %d"
+msgstr "Karakter statok rendben"
 
-#: ../src/gui/skilldialog.cpp:444
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Szint: %d"
-
-#: ../src/net/tmwa/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Attack"
-msgstr "Mágikus támadás:"
+msgid "Correction points: %d"
+msgstr "Képesség pontok: %d"
 
-#: ../src/net/tmwa/generalhandler.cpp:227
-#, fuzzy
-msgid "M.Defense"
-msgstr "Mágikus védelem:"
+#: src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Ãœzletet javasol"
 
-#: ../src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "Varázserő:"
+#: src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Megerősítve. Vár..."
 
-#: ../src/resources/itemdb.cpp:56
-#, c-format
-msgid "MP %+d"
-msgstr "Varázserő %+d"
+#: src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Üzlet elfogadása"
 
-#: ../src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "Varázserő:"
+#: src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Elfogadva. Vár..."
 
-#: ../src/net/tmwa/chathandler.cpp:190
-#, fuzzy
-msgid "MVP player."
-msgstr "Játékos"
+#: src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Ãœzlet: Te"
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
-msgid "Male"
-msgstr "Férfi"
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Ãœzlet"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Térkép"
+#: src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Hozzáad"
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Név: %s"
+msgid "You get %s"
+msgstr "Kapott tárgy: %s."
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Max."
+#: src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Adott tárgyak:"
 
-#: ../src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Közepes"
+#: src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Változtatás"
 
-#: ../src/gui/socialwindow.cpp:157
-msgid "Member Invite to Guild"
+#: src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
 
-#: ../src/gui/socialwindow.cpp:236
-#, fuzzy
-msgid "Member Invite to Party"
-msgstr "/party > Felhasználó csapatba hívása"
-
-#: ../src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "A tag előléptetése sikeres."
+#: src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "Nincs elég pénzed."
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Ãœzenet"
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Név: %s"
 
-#: ../src/commandhandler.cpp:480
-msgid "Message closes chat."
-msgstr "Az üzenet bezárja a bevitelt."
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Frissítés…"
 
-#: ../src/commandhandler.cpp:493
-msgid "Message now closes chat."
-msgstr "Az üzenet mostantól bezárja a bevitelt."
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Csatlakozás…"
 
-#: ../src/keyboardconfig.cpp:75
-msgid "Minimap Window"
-msgstr "Minitérkép Ablak"
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Játék"
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "Minitérkép Ablak"
+#: src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1 A frissítési folyamat befejezetlen"
 
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Ha nincs találat."
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1 Erősen ajánljuk, hogy"
 
-#: ../src/gui/statuswindow.cpp:224
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
-msgid "Money"
-msgstr "Pénz: %d"
+msgid "##1  you try again later."
+msgstr "##1 próbáld meg később"
 
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
-#, c-format
-msgid "Money: %s"
-msgstr "Pénz: %s"
+#: src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Kész"
 
-#: ../src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Sérüléskor"
+#: src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Kilistázza az aktuális csatorna felhasználóit"
 
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Szörny neve"
+#: src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Beállítja egy csatorna témáját."
 
-#: ../src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Mozgás lefelé"
+#: src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Csatorna elhagyása"
 
-#: ../src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Mozgás balra"
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Felhasználóból csatorna operátort képez."
 
-#: ../src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Mozgás jobbra"
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Felhasználó kirúgása a csatornából"
 
-#: ../src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Mozgás felfelé"
+#: src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Parancs: /users"
 
-#: ../src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Zene hangereje"
+#: src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Ez a parancs megmutatja ennek a csatornának a felhasználóit."
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
-#, fuzzy, c-format
-msgid "Music: %s"
-msgstr "Téma: %s"
+#: src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Parancs: /topic <téma>"
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "Gépjátékos"
+#: src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Ez a parancs beállítja a témát a <téma> alatt megadott szövegre."
 
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "Gépjátékos neve"
+#: src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Parancs: /quit"
 
-#: ../src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Név"
+#: src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Ez a parancs kilép az aktuális csatornából."
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Név:"
+#: src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Ha te vagy az utolsó személy a csatornán, akkor kitörli."
 
-#: ../src/gui/unregisterdialog.cpp:51
-#, c-format
-msgid "Name: %s"
-msgstr "Név: %s"
+#: src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Parancs: /op <név>"
 
-#: ../src/gui/ministatus.cpp:157
-msgid "Need"
+#: src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
 msgstr ""
+"Ez a parancs a <név> alatt megadott személyt csatorna operátorrá teszi."
 
-#: ../src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Kell egy játékos a kick parancshoz."
-
-#: ../src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
-msgstr "Kell egy játékos az op parancshoz."
+#: src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
+msgstr "A csatorna operátor parancsai: /kick /op"
 
-#: ../src/game.cpp:372
-msgid "Network Error"
-msgstr "Hálózati hiba"
+#: src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Parancs: /kick <név>"
 
-#: ../src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Semleges"
+#: src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Ez a parancs kirúgja a <név> alatt megadott személyt a csatornából."
 
-#: ../src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Az új email cím hibás."
+#: src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr "Kell egy játékos az op parancshoz."
 
-#: ../src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Az új jelszó hibás"
+#: src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Kell egy játékos a kick parancshoz."
 
-#: ../src/net/tmwa/loginhandler.cpp:92
-#, fuzzy
-msgid "New password too short."
-msgstr "Az új jelszó túl rövid"
+#: src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Globális bejelentés:"
 
-#: ../src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Következő"
+#: src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Globális bejelentés (%s) :"
 
-#: ../src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Következő Chat Fül"
+#: src/gui/widgets/chattab.cpp:153
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "%s mondja: "
 
-#: ../src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Nem"
+#: src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Nem tudsz üres üzenetet küldeni!"
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
+#: src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
+#: src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Nincs elérhető játékszerver."
-
-#: ../src/net/tmwa/generalhandler.cpp:132
-#, fuzzy
-msgid "No servers available."
-msgstr "Nincs elérhető szerver"
+#: src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Bezárja a privát fület."
 
-#: ../src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Nincs szöveg"
+#: src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Parancs: /close"
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Nem, gyerekek. A karakter nem meghalt, ..ööö... hanem egy szebb világba "
-"került."
+#: src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Ez a parancs bezárja az aktuális privát fület."
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
-msgid "None"
-msgstr "Nem"
+msgid "Command: /ignore"
+msgstr "Parancs: /item"
 
-#: ../src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Jelenleg nem rögzítesz."
+#: src/gui/widgets/whispertab.cpp:90
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Ez a parancs megmutatja az online játékosok számát."
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
-msgid "Not logged in."
-msgstr "Már be van jelentkezve"
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Ez a parancs elkezdi felvenni a beszélgetést a <fájlnév> alatt megadott "
+"fájlba."
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Nincs mit eladni."
+#: src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Státusz"
 
-#: ../src/gui/setup_audio.cpp:94
-#, fuzzy
-msgid "Notice"
-msgstr "Nincs szöveg"
+#: src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Gyorsmenü"
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
-msgid "OK"
-msgstr "Ok"
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Ok Kiválasztása"
 
-#: ../src/net/manaserv/loginhandler.cpp:152
+#: src/gui/worldselectdialog.cpp:76
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "A régi email cím hibás."
+msgid "Change Login"
+msgstr "Változtatás"
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
+#: src/gui/worldselectdialog.cpp:77
 #, fuzzy
-msgid "Old password incorrect."
-msgstr "A régi jelszó hibás"
+msgid "Choose World"
+msgstr "Válassz szervert"
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr ""
+#: src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Mozgás felfelé"
 
-#: ../src/net/tmwa/gamehandler.cpp:87
-#, c-format
-msgid "Online users: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Mozgás lefelé"
 
-#: ../src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Mozgás balra"
 
-#: ../src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", "
-"\"0\"."
+#: src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Mozgás jobbra"
 
-#: ../src/main.cpp:43
-msgid "Options:"
-msgstr "Opciók:"
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Támadás"
 
-#: ../src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Sebzéskor"
+#: src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Kijelöl és Támad"
 
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Ismeretlen játékos neve"
+#: src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Hangulatjel"
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Csevegés"
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr ""
+#: src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Támadás Megszüntetése"
 
-#: ../src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:48
 #, fuzzy
-msgid "Outfits Window"
-msgstr "Sztátusz Ablak"
-
-#: ../src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr "Fej feletti szöveg"
+msgid "Target Monster"
+msgstr "Legközelebbit Kijelöl"
 
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Saját név"
+#: src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "Gépjátékost Kijelöl"
 
-#: ../src/gui/setup_video.cpp:615
-#, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Effektek beállítása megváltozott."
+#: src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Játékost Kijelöl"
 
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Effektek"
+#: src/keyboardconfig.cpp:51
+msgid "Pickup"
+msgstr "Felvesz"
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Effektek"
+#: src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Ablakok Elrejtése"
 
-#: ../src/gui/setup_video.cpp:263
-#, fuzzy
-msgid "Particle detail"
-msgstr "Effektek részletessége"
+#: src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Ülés"
 
-#: ../src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Effektek részletessége"
+#: src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Képernyőkép"
 
-#: ../src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Játékbéli effektek"
+#: src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Üzletelés Engedélyezése/Tiltása"
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Csapat"
+#: src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "Útvonal Keresése a Kurzorig"
 
-#: ../src/gui/socialwindow.cpp:222
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
-msgid "Party %s quit requested."
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Csapat"
-
-#: ../src/gui/socialwindow.cpp:629
-#, fuzzy
-msgid "Party Name"
-msgstr "Csapat"
-
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "A csapatnév hiányzik."
-
-#: ../src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Csapat létrehozása sikeres."
+msgid "Item Shortcut %d"
+msgstr "Gyorsmenü %d"
 
-#: ../src/gui/beingpopup.cpp:76
-#, fuzzy, c-format
-msgid "Party: %s"
-msgstr "Csapat (%s)"
+#: src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Súgó Ablak"
 
-#: ../src/client.cpp:885
-#, fuzzy
-msgid "Password Change"
-msgstr "Jelszó:"
+#: src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Sztátusz Ablak"
 
-#: ../src/client.cpp:886
-msgid "Password changed successfully!"
-msgstr ""
+#: src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Táska Ablak"
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Jelszó:"
+#: src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Felszerelés Ablak"
 
-#: ../src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "A jelszavak nem egyeznek."
+#: src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Képességek Ablak"
 
-#: ../src/gui/popupmenu.cpp:188
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "Felvesz"
+#: src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Minitérkép Ablak"
 
-#: ../src/keyboardconfig.cpp:52
-msgid "Pickup"
-msgstr "Felvesz"
+#: src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Chat Ablak"
 
-#: ../src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "Tárgy felvételekor"
+#: src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Gyorsmenü Ablak"
 
-#: ../src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Játék"
+#: src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Beállítások Ablak"
 
-#: ../src/commandhandler.cpp:545
-msgid "Player already ignored!"
-msgstr ""
+#: src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Hibakereső Ablak"
 
-#: ../src/commandhandler.cpp:554
+#: src/keyboardconfig.cpp:79
 #, fuzzy
-msgid "Player could not be ignored!"
-msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
+msgid "Social Window"
+msgstr "Képességek Ablak"
 
-#: ../src/commandhandler.cpp:576
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
+#: src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Hangulatjel Gyorsmenü Ablak"
 
-#: ../src/net/manaserv/charhandler.cpp:193
+#: src/keyboardconfig.cpp:81
 #, fuzzy
-msgid "Player deleted."
-msgstr "Karakter törölve."
+msgid "Outfits Window"
+msgstr "Sztátusz Ablak"
 
-#: ../src/commandhandler.cpp:574
-msgid "Player no longer ignored!"
+#: src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
 msgstr ""
 
-#: ../src/commandhandler.cpp:552
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "Csapat létrehozása sikeres."
-
-#: ../src/commandhandler.cpp:569
-msgid "Player wasn't ignored!"
+#: src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Játékosok"
-
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Sebzéskor"
-
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
-msgid "Please distribute %d points"
-msgstr "Kérlek oszd el a pontjaidat (%d van még)"
+msgid "Emote Shortcut %d"
+msgstr "Hangulatjel Gyorsmenü %d"
 
-#: ../src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Kérlek távolíts el %d pontot"
+#: src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Chat Ki/Be Kapcsolása"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
-msgid "Please specify a name."
-msgstr ""
+#: src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Csevej Felfele Görgetése"
 
-#: ../src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Kérlek írd be a szerver címét és portját egyaránt."
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Csevej Lefele Görgetése"
 
-#: ../src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "A méregnek nem volt hatása..."
+#: src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "Előző Chat Fül"
 
-#: ../src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Port:"
+#: src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Következő Chat Fül"
 
-#: ../src/gui/serverdialog.cpp:452
-msgid "Preparing download"
-msgstr ""
+#: src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "Ok Kiválasztása"
 
-#: ../src/gui/chat.cpp:307
-#, fuzzy, c-format
-msgid "Present: %s; %d players are present."
-msgstr "%d játékos van a közeledben."
+#: src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Ignore input 1"
 
-#: ../src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Nyomj Ok-t a feléledéshez"
+#: src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Ignore input 2"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Nyomd meg a gombot a kalibrálás megkezdéséhez"
+#: src/keyboardconfig.cpp:183
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "�llítsd át, vagy a játék érdekesen fog viselkedni."
 
-#: ../src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "Előző Chat Fül"
+#: src/localplayer.cpp:985
+msgid "Unable to pick up item."
+msgstr "Nem tudod felvenni a tárgyat."
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "�r: %s / Teljes: %s"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:994
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Zsákmányod%s [@@%d|%s@@]."
+msgstr[1] "Zsákmányod%s [@@%d|%s@@]."
 
-#: ../src/playerrelations.cpp:326
-msgid "Print '...'"
+#: src/main.cpp:42
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: ../src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Ãœzletet javasol"
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Pulzáló"
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr "Privátok fülekbe tétele"
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Kilépés"
+#: src/main.cpp:47
+msgid "Options:"
+msgstr "Opciók:"
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Szivárvány"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version : Megmutatja a verziót"
 
-#: ../src/gui/socialwindow.cpp:556
+#: src/main.cpp:49
 #, fuzzy
-msgid "Received guild request, but one already exists."
-msgstr "Csapatba hívtak, de neked van csapatod."
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help : Megmutatja ezt a súgót"
 
-#: ../src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr "Csapatba hívtak, de neked van csapatod."
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : Konfigurációs fájl használata"
 
-#: ../src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Rögzítés..."
+#: src/main.cpp:51
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username : Bejelentkezés ezzel a felhasználónévvel"
 
-#: ../src/gui/setup_colors.cpp:108
+#: src/main.cpp:52
 #, fuzzy
-msgid "Red:"
-msgstr "Vörös: "
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password : Bejelentkezés ezzel a jelszóval"
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
-msgid "Register"
-msgstr "Regisztráció"
+#: src/main.cpp:53
+#, fuzzy
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character : Bejelentkezés ezzel a karakterrel"
 
-#: ../src/gui/login.cpp:129
+#: src/main.cpp:54
 #, fuzzy
-msgid "Registration disabled"
-msgstr "Tárgy megosztás tiltva."
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server : Szerver neve vagy IP címe"
 
-#: ../src/net/tmwa/loginhandler.cpp:165
+#: src/main.cpp:55
 #, fuzzy
-msgid "Rejected from server."
-msgstr "Visszautasított a szerver"
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port : Bejelentkezési port"
 
-#: ../src/gui/socialwindow.cpp:472
-#, fuzzy, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Csapatba hívást elutasította %s."
+#: src/main.cpp:56
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : A frissítési szerver kijelölésére használjuk"
 
-#: ../src/gui/socialwindow.cpp:453
-#, fuzzy, c-format
-msgid "Rejected party invite from %s."
-msgstr "Csapatba hívást elutasította %s."
+#: src/main.cpp:57
+#, fuzzy
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default : Válaszd ki az alapértelmezett szervert és karaktert"
 
-#: ../src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Kapcsolat"
+#: src/main.cpp:59
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update :  Frissítés átugrása"
 
-#: ../src/gui/login.cpp:60
+#: src/main.cpp:60
 #, fuzzy
-msgid "Remember username"
-msgstr "Felhasználónév megjegyzése"
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data : Könyvtár ahonnan betöltöd a játékot"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Üzleti ajánlat"
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir : Könyvtár használata gyökérkönyvtárként"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/main.cpp:62
 #, fuzzy
-msgid "Request to quit denied!"
-msgstr "Üzleti ajánlat"
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Konfigurációs fájl használata"
 
-#: ../src/client.cpp:774
+#: src/main.cpp:63
 #, fuzzy
-msgid "Requesting characters"
-msgstr "Kapcsolódási kérelem a %s nevű csatornába."
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir : Könyvtár használata gyökérkönyvtárként"
 
-#: ../src/client.cpp:858
-msgid "Requesting registration details"
-msgstr ""
+#: src/main.cpp:65
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl : OpenGL kikapcsolása erre az időszakra"
 
-#: ../src/commandhandler.cpp:436
-#, c-format
-msgid "Requesting to join channel %s."
-msgstr "Kapcsolódási kérelem a %s nevű csatornába."
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Meghaltál."
 
-#: ../src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Alaphelyzet"
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "A karaktered elvérzett a csatában."
 
-#: ../src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Ablakok alaphelyzetbe"
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Nem vagy már az élők sorában."
 
-#: ../src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "A kaszás eljött érted, hogy elvigye a lelked."
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Vége a játéknak!"
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Magához vesz"
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Nem, gyerekek. A karakter nem meghalt, ..ööö... hanem egy szebb világba "
+"került."
 
-#: ../src/commandhandler.cpp:489
-msgid "Return now toggles chat."
-msgstr "Az enter mostantól megnyitja a bevitelt."
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"A tervet, amiben a torkoddal támadsz az ellenség kardjába sikertelennek "
+"bizonyult."
 
-#: ../src/commandhandler.cpp:480
-msgid "Return toggles chat."
-msgstr "Az enter megnyitja a bevitelt."
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Úgy látszik nem futottál túl gyorsan."
 
-#: ../src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Mozgasd körbe"
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Meg akarod bánni a bűneid?"
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Kövesd a fényt az alagút végén."
 
-#: ../src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Hiba a képernyő mentése során!"
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Megöltek."
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "A képernyő felbontása megváltozott"
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Kezedbe adták a fejed."
 
-#: ../src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Képernyőkép"
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Sikolyok közepette kerültél a másvilágra."
 
-#: ../src/game.cpp:333
+#: src/net/manaserv/beinghandler.cpp:323
 #, fuzzy
-msgid "Screenshot saved as "
-msgstr "Képernyőt mentettük a ~/ helyre"
-
-#: ../src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Csevej Lefele Görgetése"
-
-#: ../src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Csevej Felfele Görgetése"
-
-#: ../src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Úgy néz ki több pénzre van szükséged... ;)"
-
-#: ../src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "Ok Kiválasztása"
+msgid "Press OK to respawn."
+msgstr " Nyomj Ok-t a feléledéshez"
 
-#: ../src/gui/worldselectdialog.cpp:71
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
-msgid "Select World"
-msgstr "Ok Kiválasztása"
-
-#: ../src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Válaszd ki mennyit akarsz eldobni."
-
-#: ../src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
-msgstr "Válaszd ki mennyit veszel magadhoz."
-
-#: ../src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Válaszd ki az elosztandó mennyiséget."
-
-#: ../src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Válaszd ki a raktározandó mennyiséget."
-
-#: ../src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
+msgid "You Died"
+msgstr "Meghaltál."
 
-#: ../src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 #, fuzzy
-msgid "Selection out of range."
-msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
+msgid "Not logged in."
+msgstr "Már be van jelentkezve"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Eladás"
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
 
-#: ../src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Küldés"
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
 
-#: ../src/gui/serverdialog.cpp:211
+#: src/net/manaserv/charhandler.cpp:147
 #, fuzzy
-msgid "Server type:"
-msgstr "Szerver:"
-
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Szerver:"
-
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Beállítások"
-
-#: ../src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Beállítások Ablak"
-
-#: ../src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Effektek hangereje"
-
-#: ../src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Ãœzlet"
-
-#: ../src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Gyorsmenü"
+msgid "Character's name already exists."
+msgstr "A felhasználónév foglalt"
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
-msgid "Show IP: Off"
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
 msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
-msgid "Show IP: On"
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254
-#, fuzzy
-msgid "Show damage"
-msgstr "A név mutatása"
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:232
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
-msgid "Show gender"
-msgstr "A név mutatása"
+msgid "Character's stats are too high."
+msgstr "Karakter statok rendben"
 
-#: ../src/gui/setup_video.cpp:227
+#: src/net/manaserv/charhandler.cpp:162
 #, fuzzy
-msgid "Show own name"
-msgstr "A név mutatása"
-
-#: ../src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
-msgstr "Értesítés tárgy felvételkor"
+msgid "Character's stats are too low."
+msgstr "Karakter statok rendben"
 
-#: ../src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "Ülés"
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Ülés sikertelen!"
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Ismeretlen hiba"
 
-#: ../src/gui/skilldialog.cpp:362
-#, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Képességek"
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Infó"
 
-#: ../src/gui/skilldialog.cpp:353
-#, fuzzy, c-format
-msgid "Skill Set %d"
-msgstr "Képesség pontok: %d"
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Karakter törölve."
 
-#: ../src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Képességek Ablak"
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
 
-#: ../src/gui/skilldialog.cpp:271
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
-msgid "Skill points available: %d"
-msgstr "Képesség pontok: %d"
-
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Képességek"
-
-#: ../src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr "Hely:"
-
-#: ../src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Kicsi"
+msgid "Unknown error (%d)."
+msgstr "Ismeretlen hiba"
 
-#: ../src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Hangulatjel"
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Nincs elérhető játékszerver."
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
-msgid "Social"
-msgstr ""
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Téma: %s"
 
-#: ../src/keyboardconfig.cpp:80
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 #, fuzzy
-msgid "Social Window"
-msgstr "Képességek Ablak"
-
-#: ../src/gui/setup_video.cpp:582
-msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
+msgid "Players in this channel:"
+msgstr "Sebzéskor"
 
-#: ../src/net/tmwa/generalhandler.cpp:136
+#: src/net/manaserv/chathandler.cpp:208
 #, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Valaki más megprobál belépni erre a fiókra"
+msgid "Error joining channel."
+msgstr "Parancs: /join <csatorna>"
 
-#: ../src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Hang"
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: ../src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
 msgstr ""
 
-#: ../src/gui/specialswindow.cpp:191
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s csatlakozott a csapathoz."
+
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
-msgid "Special %d"
+msgid "%s left the channel."
 msgstr ""
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
-msgid "Specials"
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: ../src/gui/specialswindow.cpp:174
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
-msgid "Specials Set %d"
+msgid "%s has kicked %s."
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Színkép"
-
-#: ../src/net/tmwa/generalhandler.cpp:142
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
-msgid "Speed hack detected."
-msgstr "Speed hack észlelve"
-
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
-msgid "Split"
-msgstr "Felosztás"
+msgid "Unknown channel event."
+msgstr "Ismeretlen parancs."
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
-msgstr ""
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Klán létrehozva."
 
-#: ../src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Rögzítés megkezdése..."
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Hiba a klán létrehozása közben."
 
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Statikus"
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Meghívás elküldve."
 
-#: ../src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Státusz"
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "A tag előléptetése sikeres."
 
-#: ../src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Sztátusz Ablak"
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "A tag előléptetése sikertelen."
 
-#: ../src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Leállít"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Helytelen magic_token"
 
-#: ../src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Támadás Megszüntetése"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Már be van jelentkezve"
 
-#: ../src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Rögzítés leállítása"
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "A fiók lejárt"
 
-#: ../src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Raktár"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Az új jelszó hibás"
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
-msgid "Store"
-msgstr "Raktároz"
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "A régi jelszó hibás"
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Erő"
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "A fiók nem kapcsolódott. Kérlek jelentkezz be előbb."
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Erő %+d"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Az új email cím hibás."
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Erő:"
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "A régi email cím hibás."
 
-#: ../src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Küldés"
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "Az új email cím már foglalt."
 
-#: ../src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: ../src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Karakter változtatása"
-
-#: ../src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Szerver változtatása"
-
-#: ../src/gui/setup_video.cpp:445
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Switching to Full Screen"
-msgstr "�tállás teljes képernyőre"
-
-#: ../src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Csevegés"
-
-#: ../src/gui/popupmenu.cpp:150
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@talk|Privát Te és %s között@@"
-
-#: ../src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Kijelöl és Támad"
+msgid "Client version is too old."
+msgstr "A kliens verziója túl régi"
 
-#: ../src/keyboardconfig.cpp:49
+#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Target Monster"
-msgstr "Legközelebbit Kijelöl"
-
-#: ../src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "Gépjátékost Kijelöl"
-
-#: ../src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Játékost Kijelöl"
-
-#: ../src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Szöveg"
-
-#: ../src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Öröm volt veled üzletet kötni!"
+msgid "Wrong username or password."
+msgstr "Hibás felhasználónév vagy jelszó"
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Öröm volt veled üzletet kötni!"
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "A fiók lejárt"
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "A kaszás eljött érted, hogy elvigye a lelked."
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
 
-#: ../src/game.cpp:368
+#: src/net/manaserv/loginhandler.cpp:303
 #, fuzzy
-msgid "The connection to the server was lost."
-msgstr "A kapcsolat megszakadt a szerverrel, a program most kilép."
+msgid "Wrong username, password or email address."
+msgstr "Hibás felhasználónév, jelszó, vagy email cím"
 
-#: ../src/gui/changeemaildialog.cpp:141
+#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "The email address entries mismatch."
-msgstr "Az új email cím már foglalt."
+msgid "Username already exists."
+msgstr "A felhasználónév foglalt"
 
-#: ../src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "Az új email cím már foglalt."
+msgid "Email address already exists."
+msgstr "Az email cím foglalt"
 
-#: ../src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "A felhasználónévnek legalább %d karakternek kell lennie."
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
 
-#: ../src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "A felhasználónévnek legfeljebb %d karakternek kell lennie."
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Csatlakoztál a csapathoz."
 
-#: ../src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
-msgstr ""
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s csatlakozott a csapathoz."
 
-#: ../src/gui/changepassworddialog.cpp:116
+#: src/net/manaserv/partyhandler.cpp:123
 #, fuzzy, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "A jelszónak legalább %d karakter hosszúnak kell lennie."
+msgid "%s rejected your invite."
+msgstr "%s visszautasította a csapatba hívást."
 
-#: ../src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Elfogadod a bejövő üzleti ajánlatokat."
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
-#, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "A jelszónak legalább %d karakter hosszúnak kell lennie."
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Elutasítod a bejövő üzleti ajánlatokat."
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
-#, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Üzleti ajánlat"
 
-#: ../src/gui/register.cpp:166
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "A felhasználónévnek legalább %d karakternek kell lennie."
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s üzletelni akar veled. Te akarsz vele?"
 
-#: ../src/gui/register.cpp:174
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "A felhasználónévnek legfeljebb %d karakternek kell lennie."
-
-#: ../src/net/tmwa/generalhandler.cpp:139
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "Ez a fiók már be van lépve"
-
-#: ../src/net/tmwa/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Ezzel a paranccsal a játékos elhagyja a csapatát."
-
-#: ../src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Ezzel a paranccsal a játékos elhagyja a csapatát."
-
-#: ../src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "Ez a parancs a tapasztalat megosztását szabályozza a csapaton belül."
-
-#: ../src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr "Ez a parancs a tárgyak megosztását szabályozza a csapaton belül."
-
-#: ../src/commandhandler.cpp:275
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Ez a parancs beállítja a témát a <téma> alatt megadott szövegre."
-
-#: ../src/commandhandler.cpp:229
-msgid "This command clears the chat log of previous chat."
-msgstr "Törli a beszélgetés panel tartalmát."
-
-#: ../src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "Ez a parancs bezárja az aktuális privát fület."
+msgid "Trading with %s"
+msgstr "Üzlet Te és %s között"
 
-#: ../src/commandhandler.cpp:280
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr ""
-"Ezek a parancsok új csapatot hoznak létre a <csapatnév> alatt megadott néven."
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Az üzlet megszakadt."
 
-#: ../src/commandhandler.cpp:210
-msgid "This command displays a list of all commands available."
-msgstr "Ez a parancs az elérhető parancsokat listázza."
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Sikeres üzlet."
 
-#: ../src/commandhandler.cpp:213
-msgid "This command displays help on <command>."
-msgstr ""
-"Ez a parancs segítséget nyújt a <parancsnév> alatt megadott parancshoz."
+#: src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Kirúgás sikertelen!"
 
-#: ../src/commandhandler.cpp:324
-msgid "This command displays the name of the current map."
-msgstr "Ez a parancs megmutatja az aktuális térkép nevét."
+#: src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Kirúgás sikeres!"
 
-#: ../src/commandhandler.cpp:329
-msgid "This command displays the number of players currently online."
-msgstr "Ez a parancs megmutatja az online játékosok számát."
+#: src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Nincs mit eladni."
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr ""
-"Ez a parancs megmutatja a csapat jelenlegi tapasztalatmegosztási-szabályát."
+#: src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Öröm volt veled üzletet kötni!"
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr "Ez a parancs megmutatja a csapat jelenlegi tárgymegosztási-szabályát."
+#: src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Nem tudod megvenni."
 
-#: ../src/commandhandler.cpp:313
-msgid "This command displays the return toggle status."
-msgstr "A /toggle jelenlegi állását mutatja meg."
+#: src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Öröm volt veled üzletet kötni!"
 
-#: ../src/commandhandler.cpp:302
-msgid "This command finishes a recording session."
-msgstr "Befejezi a beszélgetés rögzítését."
+#: src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Nem tudod eladni."
 
-#: ../src/commandhandler.cpp:292
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
-"Ez a parancs megmutatja a \"hallható\" játékosok nevét és fájlba is rögzíti, "
-"ha éppen rögzítjük a beszélgetést."
-
-#: ../src/commandhandler.cpp:234
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Ez a parancs megmutatja az online játékosok számát."
 
-#: ../src/gui/widgets/whispertab.cpp:89
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr "Ez a parancs megmutatja az online játékosok számát."
-
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Ez a parancs csapatba hívja a <név> alatt megadott nevű játékost."
+msgid "Cannot use this ID."
+msgstr "Nem használhatod ez a nevet."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Ez a parancs csapatba hívja a <név> alatt megadott nevű játékost."
-
-#: ../src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Ez a parancs kilép az aktuális csatornából."
+msgid "Unknown char-server failure."
+msgstr "Ismeretlen hiba"
 
-#: ../src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr ""
-"Ez a parancs a <név> alatt megadott személyt csatorna operátorrá teszi."
+#: src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Nem tudod létrehozni a karaktert. Valószínű a neve használatban van."
 
-#: ../src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Ez a parancs kirúgja a <név> alatt megadott személyt a csatornából."
+#: src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Karakter törölve."
 
-#: ../src/commandhandler.cpp:240
-msgid "This command makes you enter <channel>."
-msgstr "Belépsz a <csatorna> helyen megadott beszélgetési csatornába."
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Karakter törlése sikertelen."
 
-#: ../src/commandhandler.cpp:223
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Ez a parancs az <üzenet>-en belül megadott szöveget elküldi az összes "
-"elérhető játékosnak."
+#: src/net/tmwa/charserverhandler.cpp:266
+msgid "Strength:"
+msgstr "Erő:"
 
-#: ../src/commandhandler.cpp:258
-msgid "This command sends the text <message> to <nick>."
-msgstr ""
-"Ez a parancs elküldi az <üzenet> szövegét a <név> alatt megadott nevű "
-"játékosnak."
+#: src/net/tmwa/charserverhandler.cpp:267
+msgid "Agility:"
+msgstr "Mozgékonyság:"
 
-#: ../src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Ez a parancs beállítja a témát a <téma> alatt megadott szövegre."
+#: src/net/tmwa/charserverhandler.cpp:268
+msgid "Vitality:"
+msgstr "Egészség:"
 
-#: ../src/commandhandler.cpp:307
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr "Ez a parancs beállítja az enter billentyű használatát a játékban."
+#: src/net/tmwa/charserverhandler.cpp:269
+msgid "Intelligence:"
+msgstr "Intelligencia:"
 
-#: ../src/commandhandler.cpp:246
-msgid "This command shows a list of all channels."
-msgstr "Kilistázza az összes csatornát."
+#: src/net/tmwa/charserverhandler.cpp:270
+msgid "Dexterity:"
+msgstr "Ügyesség:"
 
-#: ../src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Ez a parancs megmutatja ennek a csatornának a felhasználóit."
+#: src/net/tmwa/charserverhandler.cpp:271
+msgid "Luck:"
+msgstr "Szerencse:"
 
-#: ../src/commandhandler.cpp:299
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr ""
-"Ez a parancs elkezdi felvenni a beszélgetést a <fájlnév> alatt megadott "
-"fájlba."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr "A privát üzenet nem lett elküldve, mert a játékos nem elérhető."
 
-#: ../src/commandhandler.cpp:318
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: ../src/gui/widgets/whispertab.cpp:95
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Ez a parancs elkezdi felvenni a beszélgetést a <fájlnév> alatt megadott "
-"fájlba."
-
-#: ../src/commandhandler.cpp:251
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Ezzel a paranccsal az állapotodat jelzed. Megjelenés: Név <üzenet>"
+msgid "MVP player."
+msgstr "Játékos"
 
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "A csatornák le vannak tiltva!"
 
-#: ../src/commandhandler.cpp:266
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/net/tmwa/gamehandler.cpp:88
+#, c-format
+msgid "Online users: %d"
 msgstr ""
-"Ez a parancs egy új fület nyit beszélgetéseidhez a <név> alatt megadott nevű "
-"játékossal."
-
-#: ../src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "�gy fog kinézni a felirat."
 
-#: ../src/net/tmwa/loginhandler.cpp:179
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
-msgid "This user name is already taken."
-msgstr "Ez a felhasználónév már foglalt."
-
-#: ../src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Apró"
-
-#: ../src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "Cél:"
+msgid "Game"
+msgstr "Név"
 
-#: ../src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr "Chat Ki/Be Kapcsolása"
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Üzleti ajánlat"
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
-msgid "Topic: %s"
-msgstr "Téma: %s"
-
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Ãœzlet"
-
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Az üzlet megszakadt."
-
-#: ../src/net/tmwa/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Az üzlet ismeretlen okból megszakadt."
-
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Sikeres üzlet."
-
-#: ../src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Ãœzlet sikertelen!"
+msgid "Strength %+d"
+msgstr "Erő %+d"
 
-#: ../src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
-msgid "Trade with %s cancelled."
-msgstr "Te és %s üzlete megszakadt."
-
-#: ../src/gui/popupmenu.cpp:83
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "Üzlet Te és %s között"
-
-#: ../src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Ãœzlet: Te"
+msgid "Agility %+d"
+msgstr "Mozgékonyság %+d"
 
-#: ../src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
-msgid "Trade: You and %s"
-msgstr "Üzlet: Te és %s"
+msgid "Vitality %+d"
+msgstr "Egészség %+d"
 
-#: ../src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Az üzlet nem lehetséges. A partner nem létezik."
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligencia %+d"
 
-#: ../src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Az üzlet nem lehetséges. A partner túl messze van."
+#: src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Ügyesség %+d"
 
-#: ../src/net/manaserv/tradehandler.cpp:135
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
-msgid "Trading with %s"
-msgstr "Üzlet Te és %s között"
+msgid "Luck %+d"
+msgstr "Szerencse %+d"
 
-#: ../src/gui/setup_video.cpp:477
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
-msgid "Transparency disabled"
-msgstr "Tapasztalat megosztás tiltva."
-
-#: ../src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
-msgstr ""
+msgid "Authentication failed."
+msgstr "Azonosítás sikertelen"
 
-#: ../src/localplayer.cpp:1251
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
-msgid "Tried to pick up nonexistent item."
-msgstr "Nem tudod felvenni a tárgyat."
-
-#: ../src/commandhandler.cpp:335
-msgid "Type /help for a list of commands."
-msgstr "Parancsok listája: /help"
+msgid "No servers available."
+msgstr "Nincs elérhető szerver"
 
-#: ../src/gui/changeemaildialog.cpp:51
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
-msgid "Type new email address twice:"
-msgstr "�rd be az új Email címet kétszer:"
+msgid "Someone else is trying to use this account."
+msgstr "Valaki más megprobál belépni erre a fiókra"
 
-#: ../src/gui/changepassworddialog.cpp:63
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
-msgid "Type new password twice:"
-msgstr "�rd be az új jelszót kétszer:"
+msgid "This account is already logged in."
+msgstr "Ez a fiók már be van lépve"
 
-#: ../src/gui/setup_colors.cpp:71
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
-msgid "Type:"
-msgstr "Típus: "
-
-#: ../src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Nem tudod megvenni."
+msgid "Speed hack detected."
+msgstr "Speed hack észlelve"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
-msgid "Unable to equip."
-msgstr "Nem tudod használni."
+#: src/net/tmwa/generalhandler.cpp:148
+#, fuzzy
+msgid "Duplicated login."
+msgstr "Duplikált bejelentkezés"
 
-#: ../src/net/tmwa/network.cpp:345
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Nem tudod eladni."
+msgid "Unknown connection error."
+msgstr "Ismeretlen kapcsolati hiba"
 
-#: ../src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Nem tudod eladni."
+#: src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Lekapcsolódtál a szerverről!"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:418
-msgid "Unable to unequip."
-msgstr "Nem tudod eltenni."
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Erő"
 
-#: ../src/gui/setup_keyboard.cpp:90
-#, fuzzy
-msgid "Unassign"
-msgstr "Hozzárendel"
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Mozgékonyság"
 
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
-msgid "Unequip"
-msgstr "Nem használ"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Egészség"
 
-#: ../src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "Nem használ"
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Intelligencia"
 
-#: ../src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "Lekezeletlen üzlet elutasító csomag."
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Ügyesség"
 
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr ""
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Szerencse"
 
-#: ../src/net/net.cpp:145
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Ismeretlen tárgy típus"
+msgid "Defense"
+msgstr "Fizikális védelem:"
 
-#: ../src/net/manaserv/chathandler.cpp:327
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
-msgid "Unknown channel event."
-msgstr "Ismeretlen parancs."
+msgid "M.Attack"
+msgstr "Mágikus támadás:"
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Ismeretlen hiba"
+msgid "M.Defense"
+msgstr "Mágikus védelem:"
 
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
-msgid "Unknown command."
-msgstr "Ismeretlen parancs."
+#: src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "Találati esély (%):"
 
-#: ../src/net/tmwa/generalhandler.cpp:148
-#, fuzzy
-msgid "Unknown connection error."
-msgstr "Ismeretlen kapcsolati hiba"
+#: src/net/tmwa/generalhandler.cpp:242
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "Kitérés (%):"
 
-#: ../src/net/manaserv/charhandler.cpp:208
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Ismeretlen hiba"
+msgid "% Critical"
+msgstr "Kritikális ütéskor"
+
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Klán"
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Megmutatja ezt a súgót."
 
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
-msgid "Unknown error."
-msgstr "Ismeretlen hiba"
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Játékos meghívása a csapatba"
 
-#: ../src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
-msgid "Unknown guild invite response."
-msgstr "%s részéről ismeretlen válasz a meghívásra."
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Jelenlegi csapat elhagyása"
 
-#: ../src/net/tmwa/partyhandler.cpp:133
-#, c-format
-msgid "Unknown invite response for %s."
-msgstr "%s részéről ismeretlen válasz a meghívásra."
+#: src/net/tmwa/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Valaki kirúgása a csapatból"
 
-#: ../src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Ismeretlen tárgy"
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Parancs: /invite <név>"
 
-#: ../src/localplayer.cpp:1258
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
-msgid "Unknown problem picking up item."
-msgstr "Nem tudod felvenni a tárgyat."
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Ez a parancs csapatba hívja a <név> alatt megadott nevű játékost."
 
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Regisztráció megszüntetése"
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Parancs: /leave"
 
-#: ../src/client.cpp:926
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
-msgid "Unregister Successful"
-msgstr "Regisztráció megszüntetése"
+msgid "This command causes the player to leave the guild."
+msgstr "Ezzel a paranccsal a játékos elhagyja a csapatát."
 
-#: ../src/net/tmwa/loginhandler.cpp:156
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
-msgid "Unregistered ID."
-msgstr "Az ID nincs regisztrálva"
-
-#: ../src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Fejleszt"
+msgid "Guild name is missing."
+msgstr "A csapatnév hiányzik."
 
-#: ../src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Frissítés…"
+#: src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
+msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
-msgid "Use"
-msgstr "Bevet"
+#: src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
+msgstr ""
 
-#: ../src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s mostantól a csapatod tagja."
 
-#: ../src/net/tmwa/guildhandler.cpp:300
-msgid "User rejected guild invite."
+#: src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:306
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
-msgid "Username already exists."
-msgstr "A felhasználónév foglalt"
-
-#: ../src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Videó"
-
-#: ../src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Látható nevek"
+msgid "Unknown guild invite response."
+msgstr "%s részéről ismeretlen válasz a meghívásra."
 
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Egészség"
+#: src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr "Egészség %+d"
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Csapat"
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Egészség:"
+#: src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Játékos meghívása a csapatba"
 
-#: ../src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "Várakozás a szerverre"
+#: src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Jelenlegi csapat elhagyása"
 
-#: ../src/gui/serverdialog.cpp:448
-#, fuzzy
-msgid "Waiting for server..."
-msgstr "Várakozás a szerverre"
+#: src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Valaki kirúgása a csapatból"
 
-#: ../src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "Teleport sikertelen..."
+#: src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Tárgyak elosztását nézhetjük/átállíthatjuk vele"
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "A karaktered elvérzett a csatában."
+#: src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Tapasztalat elosztását nézhetjük/átállíthatjuk vele"
 
-#: ../src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
-msgstr ""
+#: src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Ezzel a paranccsal a játékos elhagyja a csapatát."
 
-#: ../src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Súly:"
+#: src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Parancs: /item <szabály>"
 
-#: ../src/gui/itempopup.cpp:126
-#, fuzzy, c-format
-msgid "Weight: %s"
-msgstr "Súly: "
+#: src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr "Ez a parancs a tárgyak megosztását szabályozza a csapaton belül."
 
-#: ../src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "Ha ignorolva van:"
+#: src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<szabály> lehet \"1\", \"yes\", \"true\" a tárgyak megosztásához, vagy "
+"\"0\", \"no\", \"false\" a tárgyak megosztásának kikapcsolásához."
 
-#: ../src/gui/popupmenu.cpp:91
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "Privát üzenet"
+#: src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Parancs: /item"
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
+#: src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr "Ez a parancs megmutatja a csapat jelenlegi tárgymegosztási-szabályát."
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "A privát üzenet nem lett elküldve, mert a játékos nem elérhető."
+#: src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Parancs: /exp <szabály>"
 
-#: ../src/gui/chat.cpp:452
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Üzenet %s számára: %s"
+#: src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr "Ez a parancs a tapasztalat megosztását szabályozza a csapaton belül."
 
-#: ../src/gui/socialwindow.cpp:158
-#, c-format
-msgid "Who would you like to invite to guild %s?"
+#: src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
+"<szabály> lehet \"1\", \"yes\", \"true\" a tapasztalat megosztásához, vagy "
+"\"0\", \"no\", \"false\" a tapasztalat megosztásának kikapcsolásához."
 
-#: ../src/gui/socialwindow.cpp:237
-#, c-format
-msgid "Who would you like to invite to party %s?"
+#: src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Parancs: /exp"
+
+#: src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
 msgstr ""
+"Ez a parancs megmutatja a csapat jelenlegi tapasztalatmegosztási-szabályát."
 
-#: ../src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Akaraterő:"
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Tárgy megosztás engedélyezve."
 
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "Akaraterő: %+d"
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Tárgy megosztás tiltva."
 
-#: ../src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Helytelen magic_token"
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "A tárgy megosztás nem lehetséges."
 
-#: ../src/net/tmwa/loginhandler.cpp:159
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
-msgid "Wrong password."
-msgstr "Hibás jelszó"
+msgid "Item sharing unknown."
+msgstr "Tárgy megosztás engedélyezve."
 
-#: ../src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Hibás felhasználónév vagy jelszó"
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Tapasztalat megosztás engedélyezve."
 
-#: ../src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Hibás felhasználónév, jelszó, vagy email cím"
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr "Tapasztalat megosztás tiltva."
 
-#: ../src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Igen"
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "A tapasztalat megosztás nem lehetséges."
 
-#: ../src/net/manaserv/beinghandler.cpp:325
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
-msgid "You Died"
-msgstr "Meghaltál."
-
-#: ../src/net/tmwa/playerhandler.cpp:139
-msgid "You are an ex-player."
-msgstr "Ex-játékos lettél."
-
-#: ../src/net/tmwa/playerhandler.cpp:257
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr "Több tárgy van nálad mint a súlyod fele. Nem töltődik az életed."
-
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Meghaltál."
-
-#: ../src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Nem létezel többé."
+msgid "Experience sharing unknown."
+msgstr "Tapasztalat megosztás engedélyezve."
 
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Nem vagy már az élők sorában."
+#: src/net/tmwa/inventoryhandler.cpp:285
+msgid "Failed to use item."
+msgstr "Nem tudod bevetni a tárgyat."
 
-#: ../src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
-msgstr ""
+#: src/net/tmwa/inventoryhandler.cpp:399
+msgid "Unable to equip."
+msgstr "Nem tudod használni."
 
-#: ../src/net/tmwa/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "Most nem csinálhatod!"
+#: src/net/tmwa/inventoryhandler.cpp:410
+msgid "Unable to unequip."
+msgstr "Nem tudod eltenni."
 
-#: ../src/net/tmwa/specialhandler.cpp:189
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Ezzel a fegyverrel nem tudod ezt a képességet használni!"
+#: src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Fiók nem található. Kérem jelentkezzen be újra."
 
-#: ../src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "Nincs elég pénzed."
+#: src/net/tmwa/loginhandler.cpp:92
+#, fuzzy
+msgid "New password too short."
+msgstr "Az új jelszó túl rövid"
 
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
-#, fuzzy, c-format
-msgid "You get %s"
-msgstr "Kapott tárgy: %s."
+#: src/net/tmwa/loginhandler.cpp:156
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Az ID nincs regisztrálva"
 
-#: ../src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "Adott tárgyak:"
+#: src/net/tmwa/loginhandler.cpp:159
+#, fuzzy
+msgid "Wrong password."
+msgstr "Hibás jelszó"
 
-#: ../src/gui/socialwindow.cpp:592
-#, fuzzy, c-format
-msgid "You have been invited to join the %s party."
-msgstr "%s behívott %s csapatába."
+#: src/net/tmwa/loginhandler.cpp:162
+#, fuzzy
+msgid "Account expired."
+msgstr "A fiók lejárt"
 
-#: ../src/gui/socialwindow.cpp:588
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
-msgid "You have been invited you to join a party."
-msgstr "%s a csapatába hívott."
+msgid "Rejected from server."
+msgstr "Visszautasított a szerver"
 
-#: ../src/net/tmwa/loginhandler.cpp:168
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
@@ -3638,7 +3293,7 @@ msgstr ""
 "Véglegesen kitiltottak a szerverről. Kérlek vedd fel a kapcsolatot a GM "
 "csapattal."
 
-#: ../src/net/tmwa/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -3647,497 +3302,731 @@ msgstr ""
 "Ki vagy tiltva a szerverről hátralévő idő a feloldásig %s\n"
 "Kérlek vedd fel a kapcsolatot a GM csapattal."
 
-#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Megszüntél létezni."
+#: src/net/tmwa/loginhandler.cpp:179
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Ez a felhasználónév már foglalt."
 
-#: ../src/net/tmwa/partyhandler.cpp:241
-msgid "You have left the party."
-msgstr "Kiléptél a csapatból."
+#: src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:180
-msgid "You have no memos!"
-msgstr "Nincs feljegyzésed."
+#: src/net/tmwa/network.cpp:345
+#, fuzzy
+msgid "Unable to resolve host \""
+msgstr "Nem tudod eladni."
 
-#: ../src/net/tmwa/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Nem érted még el a megfelelő szintet!"
+#: src/net/tmwa/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "Csatlakozás a térkép szerverhez...."
 
-#: ../src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+#: src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Nem tudtad a csapatot létrehozni."
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
-msgstr ""
+#: src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Csapat létrehozása sikeres."
 
-#: ../src/net/tmwa/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "Egy másik kék kőre van szükséged!"
+#: src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s eleve tagja a csapatnak."
 
-#: ../src/net/tmwa/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "Egy másik piros kőre van szükséged!"
+#: src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s visszautasította a csapatba hívást."
 
-#: ../src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
-msgstr ""
+#: src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s mostantól a csapatod tagja."
 
-#: ../src/localplayer.cpp:1276
-#, fuzzy, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Zsákmányod%s [@@%d|%s@@]."
-msgstr[1] "Zsákmányod%s [@@%d|%s@@]."
+#: src/net/tmwa/partyhandler.cpp:131
+#, c-format
+msgid "Unknown invite response for %s."
+msgstr "%s részéről ismeretlen válasz a meghívásra."
 
-#: ../src/net/tmwa/playerhandler.cpp:344
-#, fuzzy, c-format
-msgid "You picked up %s."
-msgstr "Zsákmányod "
+#: src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Kiléptél a csapatból."
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Sikolyok közepette kerültél a másvilágra."
+#: src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s elhagyta a csapatot."
 
-#: ../src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
+#: src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Egy ismeretlen csapattárs mondja: %s"
+
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "Hulla vagy."
+#: src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "Túl sok dolgot cipelsz, hogy ezt csináld!"
+#: src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s nincs a csapatodban!"
+
+#: src/net/tmwa/playerhandler.cpp:100
+msgid "Insert coin to continue."
+msgstr "Dobj be egy érmét a folytatáshoz."
 
-#: ../src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Nem haltál meg...csak alszol..."
 
-#: ../src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
-msgstr "Elég gallyul nézel ki."
+#: src/net/tmwa/playerhandler.cpp:119
+msgid "You are no more."
+msgstr "Nem létezel többé."
 
-#: ../src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr "Az örök búzamezőkön kaszálgatsz."
+#: src/net/tmwa/playerhandler.cpp:120
+msgid "You have ceased to be."
+msgstr "Megszüntél létezni."
 
-#: ../src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Véged és elindultál találkozni a készítőddel."
 
-#: ../src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:122
+msgid "You're a stiff."
+msgstr "Hulla vagy."
+
+#: src/net/tmwa/playerhandler.cpp:123
+msgid "Bereft of life, you rest in peace."
+msgstr "Megfosztottak az életedtől. Nyugodj békében."
+
+#: src/net/tmwa/playerhandler.cpp:124
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "Szép vagy mikor alszol..."
+
+#: src/net/tmwa/playerhandler.cpp:125
+msgid "Your metabolic processes are now history."
+msgstr "Történelem vagy."
+
+#: src/net/tmwa/playerhandler.cpp:126
+msgid "You're off the twig."
+msgstr "Elég gallyul nézel ki."
+
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "Feldobtad a talpad."
 
-#: ../src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "Megfulladtál a saját véredben."
 
-#: ../src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:130
+msgid "You are an ex-player."
+msgstr "Ex-játékos lettél."
 
-#: ../src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "Történelem vagy."
+#: src/net/tmwa/playerhandler.cpp:131
+msgid "You're pining for the fjords."
+msgstr "Az örök búzamezőkön kaszálgatsz."
 
-#: ../src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "A nevednek minimum 4 karakternek kell lennie."
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
+msgid "Message"
+msgstr "Ãœzenet"
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr "Több tárgy van nálad mint a súlyod fele. Nem töltődik az életed."
+
+#: src/net/tmwa/playerhandler.cpp:313
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Zsákmányod "
+
+#: src/net/tmwa/playerhandler.cpp:348
+msgid "Cannot raise skill!"
 msgstr ""
-"A tervet, amiben a torkoddal támadsz az ellenség kardjába sikertelennek "
-"bizonyult."
 
-#: ../src/gui/setup_video.cpp:233
-msgid "as particle"
-msgstr "Karakter felett"
+#: src/net/tmwa/playerhandler.cpp:488
+msgid "Equip arrows first."
+msgstr "Előbb tegyél be nyílvesszőt."
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "magas"
+#: src/net/tmwa/specialhandler.cpp:144
+msgid "Trade failed!"
+msgstr "Ãœzlet sikertelen!"
 
-#: ../src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "Chat-en belül"
+#: src/net/tmwa/specialhandler.cpp:147
+msgid "Emote failed!"
+msgstr "Hangulatjel küldése sikertelen!"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "alacsony"
+#: src/net/tmwa/specialhandler.cpp:150
+msgid "Sit failed!"
+msgstr "Ülés sikertelen!"
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:153
+msgid "Chat creating failed!"
+msgstr "Beszélgetés létrehozása sikertelen."
 
-#: ../src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "max."
+#: src/net/tmwa/specialhandler.cpp:156
+msgid "Could not join party!"
+msgstr "Nem tudsz csatlakozni a csapatba."
 
-#: ../src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "közepes"
+#: src/net/tmwa/specialhandler.cpp:159
+msgid "Cannot shout!"
+msgstr "Nem tudsz ordítani!"
 
-#: ../src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "ki"
+#: src/net/tmwa/specialhandler.cpp:168
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Nem érted még el a megfelelő szintet!"
 
-#: ../src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:171
+msgid "Insufficient HP!"
+msgstr "Kevés az életed!"
 
-#: ../src/gui/serverdialog.cpp:558
-#, c-format
-msgid "requires v%s"
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:174
+msgid "Insufficient SP!"
+msgstr "Kimerültél."
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
-msgid "unnamed"
-msgstr "Névtelen"
+#: src/net/tmwa/specialhandler.cpp:177
+msgid "You have no memos!"
+msgstr "Nincs feljegyzésed."
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " -t nem lehet létrehozni és nincs létrehozva! Kilépés."
+#: src/net/tmwa/specialhandler.cpp:180
+msgid "You cannot do that right now!"
+msgstr "Most nem csinálhatod!"
 
-#~ msgid " host: "
-#~ msgstr " kiszolgáló: "
+#: src/net/tmwa/specialhandler.cpp:183
+msgid "Seems you need more money... ;-)"
+msgstr "Úgy néz ki több pénzre van szükséged... ;)"
 
-#~ msgid " video mode: "
-#~ msgstr " videó mód: "
+#: src/net/tmwa/specialhandler.cpp:186
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Ezzel a fegyverrel nem tudod ezt a képességet használni!"
 
-#~ msgid "% Reflex:"
-#~ msgstr "Reflex (%):"
+#: src/net/tmwa/specialhandler.cpp:189
+msgid "You need another red gem!"
+msgstr "Egy másik piros kőre van szükséged!"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Ugyanaz, mint a /create"
+#: src/net/tmwa/specialhandler.cpp:192
+msgid "You need another blue gem!"
+msgstr "Egy másik kék kőre van szükséged!"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 élet csík"
+#: src/net/tmwa/specialhandler.cpp:195
+msgid "You're carrying to much to do this!"
+msgstr "Túl sok dolgot cipelsz, hogy ezt csináld!"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 Élet csík"
+#: src/net/tmwa/specialhandler.cpp:198
+msgid "Huh? What's that?"
+msgstr "Huh? Mi volt ez?"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "2 kezes fegyverek"
+#: src/net/tmwa/specialhandler.cpp:207
+msgid "Warp failed..."
+msgstr "Teleport sikertelen..."
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 élet csík"
+#: src/net/tmwa/specialhandler.cpp:210
+msgid "Could not steal anything..."
+msgstr "Nem tudsz semmit ellopni..."
 
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Játékos kirúgása@@"
+#: src/net/tmwa/specialhandler.cpp:213
+msgid "Poison had no effect..."
+msgstr "A méregnek nem volt hatása..."
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|%s megtámadása@@"
+#: src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Az üzlet nem lehetséges. A partner túl messze van."
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|mégse@@"
+#: src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Az üzlet nem lehetséges. A partner nem létezik."
 
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|Semmibe veszed %s-t@@"
+#: src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Az üzlet ismeretlen okból megszakadt."
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Eldob@@"
+#: src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Üzlet: Te és %s"
 
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|%s tiltása@@"
+#: src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Te és %s üzlete megszakadt."
 
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|Vedd fel a(z) %s-t@@"
+#: src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr "Lekezeletlen üzlet elutasító csomag."
 
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|Visszavesz@@"
+#: src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Tárgy hozzáadása sikertelen. Az üzleti partner túl van terhelve."
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Szétválaszt@@"
+#: src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Tárgy hozzáadása sikertelen. Az üzleti partnernek nincs elég helye."
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Raktároz@@"
+#: src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Ismeretlen okból a tárgy hozzáadása sikertelen."
 
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Üzlet Te és %s között@@"
+#: src/playerrelations.cpp:310
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|Teljesen letiltod %s-t@@"
 
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|%s tiltásának feloldása@@"
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Használ@@"
+#: src/playerrelations.cpp:340
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Nem használ@@"
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "Támadás %+d"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Bevet@@"
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "Védelem %+d"
+
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "Élet: %+d"
+
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
+msgstr "Varázserő %+d"
+
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Ismeretlen tárgy"
+
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "Névtelen"
+
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "Élet:"
+
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "Varázserő:"
+
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "TP:"
+
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Pénz: %d"
+
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Munka:"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Szint: %d"
 
 #, fuzzy
 #~ msgid "Access denied."
 #~ msgstr "Hozzáférés megtagadva"
 
-#~ msgid "Ammo"
-#~ msgstr "Töltény"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Ismeretlen hiba a karakter választásnál."
 
-#~ msgid "Arms"
-#~ msgstr "Kezek"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Meghívás jelenleg nem lehetséges."
 
-#~ msgid "Attack:"
-#~ msgstr "Fizikális sebzés:"
+#~ msgid "Willpower:"
+#~ msgstr "Akaraterő:"
 
-#~ msgid "Axe"
-#~ msgstr "Fejsze"
+#~ msgid "Willpower %+d"
+#~ msgstr "Akaraterő: %+d"
+
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Akaraterő:"
+
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "A szerver tele van"
+
+#~ msgid "Text Shadow"
+#~ msgstr "Szövegárnyék"
+
+#~ msgid "Text Outline"
+#~ msgstr "Szöveg körvonala"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Töltésjelző cimkék"
 
 #~ msgid "Background"
 #~ msgstr "Háttér"
 
-#~ msgid "Bow"
-#~ msgstr "�j"
+#~ msgid "Highlight"
+#~ msgstr "Kijelölt"
 
-#~ msgid "Buddy"
-#~ msgstr "Partner"
+#~ msgid "Tab Highlight"
+#~ msgstr "Kijelölt fül"
 
-#~ msgid "Buddy List"
-#~ msgstr "Partnerlista"
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "A tárgy túl drága"
 
-#~ msgid "Buddys"
-#~ msgstr "Partnerek"
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "A tárgy használatban van"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Teszt Varázs 1 Bevetése"
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Teszt Varázs 2 Bevetése"
+#~ msgid "Player"
+#~ msgstr "Játékos"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Teszt Varázs 3 Bevetése"
+#~ msgid "Whisper"
+#~ msgstr "Privát üzenet"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Parancs: /new <csapatnév>"
+#~ msgid "Is"
+#~ msgstr "Is"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Csatlakozás a fiók szerverhez..."
+#~ msgid "Server"
+#~ msgstr "Szerver"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Csatlakozás a karakter szerverhez...."
+#~ msgid "Logger"
+#~ msgstr "Rögzítő"
 
-#~ msgid "Cost"
-#~ msgstr "Költség"
+#~ msgid "Hyperlink"
+#~ msgstr "Hiperlink"
 
-#~ msgid "Couldn't set "
-#~ msgstr "Nem lehet beállítani: "
+#~ msgid "Being"
+#~ msgstr "Nevek"
 
-#~ msgid "Craft"
-#~ msgstr "Mesterség"
+#~ msgid "Other Players' Names"
+#~ msgstr "Ismeretlen játékos neve"
 
-#~ msgid "Crafts"
-#~ msgstr "Mesterségek"
+#~ msgid "Own Name"
+#~ msgstr "Saját név"
 
-#~ msgid "Description: %s"
-#~ msgstr "Leírás: %s"
+#~ msgid "GM Names"
+#~ msgstr "GM név"
 
-#~ msgid "Effect: %s"
-#~ msgstr "Hatás: %s"
+#~ msgid "NPCs"
+#~ msgstr "Gépjátékos neve"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Nem lehet erre váltani: "
+#~ msgid "Monsters"
+#~ msgstr "Szörny neve"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Ismeretlen tárgy típus"
 
 #~ msgid "Generics"
 #~ msgstr "Gyógyszer"
 
-#~ msgid "Guilds"
-#~ msgstr "Klánok"
-
-#~ msgid "HP Bar"
-#~ msgstr "Élet csík"
-
 #~ msgid "Hats"
 #~ msgstr "Fejfedő"
 
-#~ msgid "Highlight"
-#~ msgstr "Kijelölt"
+#~ msgid "Usables"
+#~ msgstr "Bevethető"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Hiperlink"
+#~ msgid "Shirts"
+#~ msgstr "Felső"
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Meghívás jelenleg nem lehetséges."
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "1 kezes fegyverek"
 
-#~ msgid "Is"
-#~ msgstr "Is"
+#~ msgid "Pants"
+#~ msgstr "Nadrág"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "A tárgy használatban van"
+#~ msgid "Shoes"
+#~ msgstr "Cipő"
 
 #, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "A tárgy túl drága"
-
-#~ msgid "Job Level: %d"
-#~ msgstr "Munka szint: %d"
+#~ msgid "Two Handed Weapons"
+#~ msgstr "1 kezes fegyverek"
 
-#~ msgid "Knife"
-#~ msgstr "Kés"
+#~ msgid "Shields"
+#~ msgstr "Pajzsok"
 
-#~ msgid "Logger"
-#~ msgstr "Rögzítő"
+#~ msgid "Rings"
+#~ msgstr "Gyűrűk"
 
-#~ msgid "Mace"
-#~ msgstr "Buzogány"
+#~ msgid "Necklaces"
+#~ msgstr "Nyaklánc"
 
-#~ msgid "Magic"
-#~ msgstr "Mágia"
+#~ msgid "Arms"
+#~ msgstr "Kezek"
 
-#~ msgid "Max level"
-#~ msgstr "Max. szint"
+#~ msgid "Ammo"
+#~ msgstr "Töltény"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Misztikus képesség"
+#~ msgid "Particle Effects"
+#~ msgstr "Effektek"
 
-#~ msgid "Necklaces"
-#~ msgstr "Nyaklánc"
+#~ msgid "Pickup Notification"
+#~ msgstr "Tárgy felvételekor"
 
-#~ msgid "New"
-#~ msgstr "Új"
+#~ msgid "Exp Notification"
+#~ msgstr "Tapasztalat szerzésekor"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Sebzéskor"
 
 #, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "1 kezes fegyverek"
+#~ msgid "Monster Hits Player"
+#~ msgstr "Sérüléskor"
 
-#~ msgid "Pants"
-#~ msgstr "Nadrág"
+#~ msgid "Critical Hit"
+#~ msgstr "Kritikális ütéskor"
 
-#~ msgid "Party Window"
-#~ msgstr "Csapat Ablak"
+#~ msgid "Misses"
+#~ msgstr "Ha nincs találat."
 
-#~ msgid "Player"
-#~ msgstr "Játékos"
+#~ msgid "HP Bar"
+#~ msgstr "Élet csík"
 
-#~ msgid "Polearm"
-#~ msgstr "Szálfegyver"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 élet csík"
 
-#~ msgid "Present: "
-#~ msgstr "Közel van: "
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 élet csík"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 Élet csík"
+
+#~ msgid "no"
+#~ msgstr "Nem"
+
+#~ msgid "Buddy"
+#~ msgstr "Partner"
+
+#~ msgid "Buddy List"
+#~ msgstr "Partnerlista"
+
+#~ msgid "Description: %s"
+#~ msgstr "Leírás: %s"
+
+#~ msgid "Effect: %s"
+#~ msgstr "Hatás: %s"
 
 #~ msgid "Previous"
 #~ msgstr "Előző"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Töltésjelző cimkék"
+#~ msgid "New"
+#~ msgstr "Új"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "Munka szint: %d"
+
+#~ msgid "Present: "
+#~ msgstr "Közel van: "
 
 #~ msgid "Quit Guild"
 #~ msgstr "Klán elhagyása"
 
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #~ msgid "Recent:"
 #~ msgstr "Előzmény:"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Elosztható pontok: %d"
+#~ msgid "Magic"
+#~ msgstr "Mágia"
 
-#~ msgid "Rings"
-#~ msgstr "Gyűrűk"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Teszt Varázs 1 Bevetése"
+
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Teszt Varázs 2 Bevetése"
+
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Teszt Varázs 3 Bevetése"
+
+#~ msgid "2 Handed Weapons"
+#~ msgstr "2 kezes fegyverek"
+
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Üzlet Te és %s között@@"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|%s megtámadása@@"
+
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Semmibe veszed %s-t@@"
+
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|%s tiltása@@"
+
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|%s tiltásának feloldása@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Játékos kirúgása@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|mégse@@"
+
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Vedd fel a(z) %s-t@@"
+
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Nem használ@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Használ@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Bevet@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Eldob@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Szétválaszt@@"
+
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Raktároz@@"
+
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Visszavesz@@"
 
 #~ msgid "Select Server"
 #~ msgstr "Válassza ki a szervert"
 
-#~ msgid "Server"
-#~ msgstr "Szerver"
+#~ msgid "Failed to switch to "
+#~ msgstr "Nem lehet erre váltani: "
 
-#~ msgid "Shields"
-#~ msgstr "Pajzsok"
+#~ msgid "windowed"
+#~ msgstr "ablakban"
 
-#~ msgid "Shirts"
-#~ msgstr "Felső"
+#~ msgid "fullscreen"
+#~ msgstr "teljes képernyőn"
 
-#~ msgid "Shoes"
-#~ msgstr "Cipő"
+#~ msgid "Mystery Skill"
+#~ msgstr "Misztikus képesség"
 
-#~ msgid "Shooting"
-#~ msgstr "LÅ‘fegyver"
+#~ msgid "Weapons"
+#~ msgstr "Fegyverek"
 
-#~ msgid "Staff"
-#~ msgstr "Bot"
+#~ msgid "Crafts"
+#~ msgstr "Mesterségek"
 
 #~ msgid "Stats"
 #~ msgstr "Statok"
 
-#~ msgid "Sword"
-#~ msgstr "Kard"
+#~ msgid "Total"
+#~ msgstr "Összes"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Kijelölt fül"
+#~ msgid "Cost"
+#~ msgstr "Költség"
 
-#~ msgid "Text Outline"
-#~ msgstr "Szöveg körvonala"
+#~ msgid "Attack:"
+#~ msgstr "Fizikális sebzés:"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Szövegárnyék"
+#~ msgid "% Reflex:"
+#~ msgstr "Reflex (%):"
 
-#~ msgid "Thrown"
-#~ msgstr "Dobófegyver"
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Elosztható pontok: %d"
 
-#~ msgid "Total"
-#~ msgstr "Összes"
+#~ msgid "Max level"
+#~ msgstr "Max. szint"
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "1 kezes fegyverek"
+#~ msgid "curl error "
+#~ msgstr "curl hiba "
+
+#~ msgid " host: "
+#~ msgstr " kiszolgáló: "
+
+#~ msgid "Guilds"
+#~ msgstr "Klánok"
+
+#~ msgid "Buddys"
+#~ msgstr "Partnerek"
+
+#~ msgid "Party Window"
+#~ msgstr "Csapat Ablak"
 
 #~ msgid "Unarmed"
 #~ msgstr "Ököl"
 
-#~ msgid "Unknown Skill"
-#~ msgstr "Ismeretlen Képesség"
-
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Ismeretlen hiba a karakter választásnál."
+#~ msgid "Knife"
+#~ msgstr "Kés"
 
-#~ msgid "Unnamed"
-#~ msgstr "Névtelen"
+#~ msgid "Sword"
+#~ msgstr "Kard"
 
-#~ msgid "Usables"
-#~ msgstr "Bevethető"
+#~ msgid "Polearm"
+#~ msgstr "Szálfegyver"
 
-#~ msgid "Weapons"
-#~ msgstr "Fegyverek"
+#~ msgid "Staff"
+#~ msgstr "Bot"
 
 #~ msgid "Whip"
 #~ msgstr "Ostor"
 
-#~ msgid "Whisper"
-#~ msgstr "Privát üzenet"
+#~ msgid "Bow"
+#~ msgstr "�j"
 
-#~ msgid "Willpower:"
-#~ msgstr "Akaraterő:"
+#~ msgid "Shooting"
+#~ msgstr "LÅ‘fegyver"
 
-#~ msgid "a"
-#~ msgstr ":"
+#~ msgid "Mace"
+#~ msgstr "Buzogány"
 
-#~ msgid "curl error "
-#~ msgstr "curl hiba "
+#~ msgid "Axe"
+#~ msgstr "Fejsze"
 
-#~ msgid "fullscreen"
-#~ msgstr "teljes képernyőn"
+#~ msgid "Thrown"
+#~ msgstr "Dobófegyver"
+
+#~ msgid "Craft"
+#~ msgstr "Mesterség"
+
+#~ msgid "Unknown Skill"
+#~ msgstr "Ismeretlen Képesség"
+
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " -t nem lehet létrehozni és nincs létrehozva! Kilépés."
+
+#~ msgid "Couldn't set "
+#~ msgstr "Nem lehet beállítani: "
+
+#~ msgid " video mode: "
+#~ msgstr " videó mód: "
 
 #~ msgid "mana"
 #~ msgstr "mana"
 
-#~ msgid "no"
-#~ msgstr "Nem"
+#~ msgid "Connecting to character server..."
+#~ msgstr "Csatlakozás a karakter szerverhez...."
 
-#~ msgid "windowed"
-#~ msgstr "ablakban"
+#~ msgid "Connecting to account server..."
+#~ msgstr "Csatlakozás a fiók szerverhez..."
+
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Ugyanaz, mint a /create"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Parancs: /new <csapatnév>"
+
+#~ msgid "a"
+#~ msgstr ":"
+
+#~ msgid "Unnamed"
+#~ msgstr "Névtelen"
diff --git a/po/id.po b/po/id.po
index 7012593b..d7b9e01e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-11-21 12:11+0000\n"
 "Last-Translator: Rainfeed <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -19,480 +19,458 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Atur"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Menyambung..."
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Login"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Pilih Karakter"
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Ubah"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Kata Sandi:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Ubah"
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Tidak terdaftar"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Perintah tidak dikenal."
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Pengumuman global (khusus GM)"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Perintah: /help"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Perintah: /announce <pesan>"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** hanya tersedia bagi GM ***"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Perintah: /clear"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Perintah: /announce <pesan>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Perintah: /clear"
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-#, fuzzy
-msgid "Command: /away"
-msgstr "Perintah: /clear"
-
-#: src/commandhandler.cpp:274
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Perintah: /clear"
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Perintah: /announce <pesan>"
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -501,39 +479,39 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -547,34 +525,34 @@ msgstr ""
 msgid "Buy"
 msgstr "Beli"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -588,11 +566,11 @@ msgstr "Jual"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Batal"
@@ -665,14 +643,14 @@ msgstr "Buat Karakter"
 msgid "Name:"
 msgstr "Nama:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -689,8 +667,8 @@ msgstr "Warna Rambut:"
 msgid "Hair style:"
 msgstr "Gaya Rambut:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Buat"
 
@@ -746,8 +724,8 @@ msgstr "Tidak terdaftar"
 msgid "Change Email"
 msgstr "Ubah"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Hapus"
 
@@ -755,24 +733,24 @@ msgstr "Hapus"
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -838,8 +816,8 @@ msgstr ""
 msgid "Equipment"
 msgstr "Perlengkapan"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
@@ -847,7 +825,7 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
@@ -859,81 +837,84 @@ msgstr "Inventaris"
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Gunakan"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Jatuh"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Pecah"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Jatuh"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang mau di buang"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Pilih jumlah item yang mau di pisahkan"
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Efek: %s"
@@ -963,40 +944,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Berikutnya"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1011,7 +992,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1097,7 +1078,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1169,59 +1150,59 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Menyambung..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Tolong tulis address dan port dari server"
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1258,50 +1239,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1385,27 +1366,31 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1461,491 +1446,462 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Batas FPS"
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Tidak"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Mengganti ke layar penuh"
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Mengubah OpenGL"
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Keahlian"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Keahlian"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Tingkatan: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Buat Karakter"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "Uang: %d"
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Stats Karakter OK"
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Tingkatan: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Menawarkan tukar menukar"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Tambah"
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Anda memberikan:"
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Anda memberikan:"
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Ubah"
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1984,78 +1940,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2132,54 +2016,54 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Perintah: /help"
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2204,391 +2088,404 @@ msgstr "Ubah"
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
 msgid "You Died"
 msgstr "Anda memberikan:"
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
 msgid "Character's stats are too high."
 msgstr "Stats Karakter OK"
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 #, fuzzy
 msgid "Character's stats are too low."
 msgstr "Stats Karakter OK"
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2596,92 +2493,92 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Perintah tidak dikenal."
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Perintah tidak dikenal."
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "Perintah tidak dikenal."
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2758,11 +2655,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2772,188 +2669,135 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Ketekunan"
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Perintah tidak dikenal."
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Kekuatan"
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Kecerdasan"
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Ketangkasan"
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2967,73 +2811,118 @@ msgstr "Nama:"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Pertahanan %+d"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Serangan %+d"
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Pertahanan %+d"
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3078,27 +2967,27 @@ msgstr ""
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3174,15 +3063,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3190,15 +3079,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3206,15 +3095,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3271,7 +3160,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3279,242 +3168,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3530,58 +3414,61 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr "Serangan %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr "Pertahanan %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Uang: %d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Tingkatan: %d"
+
 #~ msgid "Willpower:"
 #~ msgstr "Ketekunan"
 
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Ketekunan"
+
 #~ msgid "Description: %s"
 #~ msgstr "Deskripsi: %s"
 
diff --git a/po/it.po b/po/it.po
index 02f1b01b..4da918d8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-02-18 14:01+0000\n"
 "Last-Translator: Gabriel Rota <gabriel.rota@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -21,416 +21,358 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/npcdialog.cpp:183
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Prossimo"
-
-#: ../src/main.cpp:60
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : Disabilita OpenGL per questa sessione"
-
-#: ../src/main.cpp:58
-#, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir : Directory da usare come home directory"
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Impostazioni"
 
-#: ../src/main.cpp:52
+#: src/client.cpp:679
 #, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Usa questo host per gli aggiornamenti"
+msgid "Connecting to server"
+msgstr "Connessione al server della mappa..."
 
-#: ../src/main.cpp:46
+#: src/client.cpp:706
 #, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : File di configurazione da utilizzare"
+msgid "Logging in"
+msgstr "Autenticazione"
 
-#: ../src/main.cpp:53
-msgid "  -D --default        : Choose default character server and character"
+#: src/client.cpp:739
+msgid "Entering game world"
 msgstr ""
 
-#: ../src/main.cpp:57
-#, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir : Directory da usare come home directory"
-
-#: ../src/main.cpp:48
-#, fuzzy
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Accedi con questa password"
-
-#: ../src/main.cpp:47
+#: src/client.cpp:804
 #, fuzzy
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Accedi con questo nome utente"
+msgid "Requesting characters"
+msgstr "Scelta Personaggio"
 
-#: ../src/main.cpp:49
+#: src/client.cpp:833
 #, fuzzy
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Accedi con questo personaggio"
+msgid "Connecting to the game server"
+msgstr "Connessione al server della mappa..."
 
-#: ../src/main.cpp:56
+#: src/client.cpp:843
 #, fuzzy
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Diectory dalla quale caricare i dati di gioco"
+msgid "Changing game servers"
+msgstr "Server"
 
-#: ../src/main.cpp:45
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help        : Mostra questo aiuto"
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Errore"
 
-#: ../src/main.cpp:51
-#, fuzzy
-msgid "  -p --port           : Login server port"
-msgstr "  -s --server : Nome o IP del server di login"
+#: src/client.cpp:888
+msgid "Requesting registration details"
+msgstr ""
 
-#: ../src/main.cpp:50
+#: src/client.cpp:915
 #, fuzzy
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Nome o IP del server di login"
+msgid "Password Change"
+msgstr "Password:"
 
-#: ../src/main.cpp:55
-#, fuzzy
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Salta i download degli update"
+#: src/client.cpp:916
+msgid "Password changed successfully!"
+msgstr ""
 
-#: ../src/main.cpp:44
+#: src/client.cpp:935
 #, fuzzy
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Mostra la versione"
-
-#: ../src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1 È fortemente raccomandato"
+msgid "Email Change"
+msgstr "Cambia"
 
-#: ../src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1 L'aggiornamento è stato completato."
+#: src/client.cpp:936
+msgid "Email changed successfully!"
+msgstr ""
 
-#: ../src/gui/updatewindow.cpp:421
+#: src/client.cpp:956
 #, fuzzy
-msgid "##1  you try again later."
-msgstr "##1 prova più tardi"
-
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Accuratezza:"
-
-#: ../src/net/tmwa/generalhandler.cpp:230
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "Colpo critico"
-
-#: ../src/net/tmwa/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% Evasione:"
-
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr ""
+msgid "Unregister Successful"
+msgstr "Cancella registrazione"
 
-#: ../src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
+#: src/client.cpp:957
+msgid "Farewell, come back any time..."
 msgstr ""
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:291
+#: src/client.cpp:1281
 #, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s si è unito al party."
+msgid "Invalid update host: %s"
+msgstr "Host di aggiornamento non valido: "
 
-#: ../src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s ti ha invitato ad unirti al party %s."
+#: src/client.cpp:1315 src/client.cpp:1321
+msgid "Error creating updates directory!"
+msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: ../src/gui/socialwindow.cpp:561
-#, fuzzy, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s ti ha invitato ad unirti al party %s."
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
+msgid "Unknown command."
+msgstr "Comando sconosciuto."
 
-#: ../src/gui/socialwindow.cpp:600
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s ti ha invitato ad unirti al suo party."
+#: src/commandhandler.cpp:160
+msgid "-- Help --"
+msgstr "-- Aiuto --"
 
-#: ../src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#: src/commandhandler.cpp:161
+msgid "/help > Display this help"
+msgstr "/help > Mostra questo aiuto"
 
-#: ../src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s ha lasciato il tuo party."
+#: src/commandhandler.cpp:163
+msgid "/where > Display map name"
+msgstr "/where > Mostra il nome della mappa"
 
-#: ../src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#: src/commandhandler.cpp:164
+msgid "/who > Display number of online users"
+msgstr "/who > Mostra il numero di utenti in linea"
 
-#: ../src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s è già membro di un party."
+#: src/commandhandler.cpp:165
+msgid "/me > Tell something about yourself"
+msgstr "/me > Scrivi un messaggio riguardante te"
 
-#: ../src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s non è nel tuo party!"
+#: src/commandhandler.cpp:167
+msgid "/clear > Clears this window"
+msgstr "/clear > Pulisce questa finestra"
 
-#: ../src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s è ora un membro del tuo party."
+#: src/commandhandler.cpp:169
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Invia un messaggio privato ad un utente"
 
-#: ../src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s si è unito al party."
+#: src/commandhandler.cpp:170
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Equivale a \"msg\""
 
-#: ../src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
+#: src/commandhandler.cpp:171
+msgid "/w > Alias of msg"
+msgstr "/w > Equivale a \"msg\""
+
+#: src/commandhandler.cpp:172
+msgid "/query > Makes a tab for private messages with another user"
+msgstr "/query > Apre una scheda per i messaggi privati con un altro utente"
+
+#: src/commandhandler.cpp:174
+msgid "/q > Alias of query"
+msgstr "/q > Equivale a \"query\""
+
+#: src/commandhandler.cpp:176
+msgid "/ignore > ignore a player"
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s ha rifiutato il tuo invito."
+#: src/commandhandler.cpp:177
+msgid "/unignore > stop ignoring a player"
+msgstr ""
 
-#: ../src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s ha rifiutato il tuo invito."
+#: src/commandhandler.cpp:179
+msgid "/list > Display all public channels"
+msgstr "/list > Mostra tutti i canali pubblici"
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s vuole commerciare con te, accetti?"
+#: src/commandhandler.cpp:180
+msgid "/join > Join or create a channel"
+msgstr "/join > Partecipa o crea un canale"
 
-#: ../src/gui/widgets/chattab.cpp:152
-#, fuzzy, c-format
-msgid "%s whispers: %s"
-msgstr "%s sospira: "
+#: src/commandhandler.cpp:182
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Crea un nuovo party"
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
-msgid "(empty)"
-msgstr ""
+#: src/commandhandler.cpp:183
+msgid "/party > Invite a user to party"
+msgstr "/party > Invita un utente nel party"
 
-#: ../src/commandhandler.cpp:222
-msgid "*** only available to a GM ***"
-msgstr "*** disponibile solo ai GM ***"
+#: src/commandhandler.cpp:185
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record> Inizia la registrazione della chat in un file esterno"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
-msgid "+"
-msgstr ""
+#: src/commandhandler.cpp:187
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr "/toggle > Determina se <invio> apre/chiude il registro della chat"
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
-msgid "-"
+#: src/commandhandler.cpp:189
+msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
+"/present > Ottiene una lista dei giocatori presenti (inviato al registro di "
+"chat, se è attivo)"
 
-#: ../src/commandhandler.cpp:166
-msgid "-- Help --"
-msgstr "-- Aiuto --"
-
-#: ../src/commandhandler.cpp:201
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Annuncio globale (solo GM)"
 
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
+#: src/commandhandler.cpp:196
+msgid "For more information, type /help <command>."
+msgstr "Per maggiori informazioni, digitare /help <comando>."
 
-#: ../src/commandhandler.cpp:173
-msgid "/clear > Clears this window"
-msgstr "/clear > Pulisce questa finestra"
+#: src/commandhandler.cpp:200
+msgid "Command: /help"
+msgstr "Comando: /help"
 
-#: ../src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Chiude la scheda del sussurro"
+#: src/commandhandler.cpp:201
+msgid "This command displays a list of all commands available."
+msgstr "Questo comando mostra una lista di tutti i comandi disponibili."
 
-#: ../src/commandhandler.cpp:191
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Crea un nuovo party"
+#: src/commandhandler.cpp:203
+msgid "Command: /help <command>"
+msgstr "Comando: /help <comando>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr ""
-"/item > Mostra/modifica le opzioni di condivisione dei punti esperienza nel "
-"gruppo"
+#: src/commandhandler.cpp:204
+msgid "This command displays help on <command>."
+msgstr "Questo comando mostra l'aiuto per <comando>."
 
-#: ../src/commandhandler.cpp:167
-msgid "/help > Display this help"
-msgstr "/help > Mostra questo aiuto"
+#: src/commandhandler.cpp:212
+msgid "Command: /announce <msg>"
+msgstr "Comando: /announce <msg>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Mostra questo messaggio di aiuto"
+#: src/commandhandler.cpp:213
+msgid "*** only available to a GM ***"
+msgstr "*** disponibile solo ai GM ***"
 
-#: ../src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
-msgstr ""
+#: src/commandhandler.cpp:214
+msgid "This command sends the message <msg> to all players currently online."
+msgstr "Questo comando invia un messaggio <msg> a tutti i giocatori in linea."
 
-#: ../src/commandhandler.cpp:185
-msgid "/ignore > ignore a player"
-msgstr ""
+#: src/commandhandler.cpp:219
+msgid "Command: /clear"
+msgstr "Comando: /clear"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
+#: src/commandhandler.cpp:220
+msgid "This command clears the chat log of previous chat."
+msgstr "Questo comando pulisce il registro della chat precedente"
+
+#: src/commandhandler.cpp:224
 #, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invita un giocatore al tuo party"
+msgid "Command: /ignore <player>"
+msgstr "Comando: /item <politica>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Invita un giocatore al tuo party"
+#: src/commandhandler.cpp:225
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
 
-#: ../src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr ""
-"/item > Mostra/modifica le opzioni di condivisione degli oggetti nel gruppo"
+#: src/commandhandler.cpp:230
+msgid "Command: /join <channel>"
+msgstr "Comando: /join <canale>"
 
-#: ../src/commandhandler.cpp:189
-msgid "/join > Join or create a channel"
-msgstr "/join > Partecipa o crea un canale"
+#: src/commandhandler.cpp:231
+msgid "This command makes you enter <channel>."
+msgstr "Questo comando effettua l'accesso al <canale> specificato."
 
-#: ../src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Espelle un utente dal canale"
+#: src/commandhandler.cpp:232
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Se il <canale> non esiste, viene creato."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
-#, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Escludi qualcuno dal gruppo in cui ti trovi"
+#: src/commandhandler.cpp:236
+msgid "Command: /list"
+msgstr "Comando: /list"
 
-#: ../src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Escludi qualcuno dal gruppo in cui ti trovi"
+#: src/commandhandler.cpp:237
+msgid "This command shows a list of all channels."
+msgstr "Questo comando mostra una lista di tutti i canali."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
-#, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Abbandona il party"
+#: src/commandhandler.cpp:241
+msgid "Command: /me <message>"
+msgstr "Comando: /me <messaggio>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Abbandona il party"
+#: src/commandhandler.cpp:242
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Questo comando mostra agli altri ciò che stai <messaggio>."
 
-#: ../src/commandhandler.cpp:188
-msgid "/list > Display all public channels"
-msgstr "/list > Mostra tutti i canali pubblici"
+#: src/commandhandler.cpp:246
+msgid "Command: /msg <nick> <message>"
+msgstr "Comando: /msg <nick> <messaggio>"
 
-#: ../src/commandhandler.cpp:171
-msgid "/me > Tell something about yourself"
-msgstr "/me > Scrivi un messaggio riguardante te"
+#: src/commandhandler.cpp:247
+msgid "Command: /whisper <nick> <message>"
+msgstr "Comando: /whisper <nick> <messaggio>"
 
-#: ../src/commandhandler.cpp:175
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Invia un messaggio privato ad un utente"
+#: src/commandhandler.cpp:248
+msgid "Command: /w <nick> <message>"
+msgstr "Comando: /w <nick> <messaggio>"
 
-#: ../src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Trasforma un utente in operatore"
+#: src/commandhandler.cpp:249
+msgid "This command sends the text <message> to <nick>."
+msgstr "Questo comando invia il testo <messaggio> all'utente <nick>."
 
-#: ../src/commandhandler.cpp:192
-msgid "/party > Invite a user to party"
-msgstr "/party > Invita un utente nel party"
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Se il <nick> contiene spazi, racchiuderlo tra virgolette (\")."
 
-#: ../src/commandhandler.cpp:198
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Ottiene una lista dei giocatori presenti (inviato al registro di "
-"chat, se è attivo)"
+#: src/commandhandler.cpp:255
+msgid "Command: /query <nick>"
+msgstr "Comando: /query <nick>"
 
-#: ../src/commandhandler.cpp:180
-msgid "/q > Alias of query"
-msgstr "/q > Equivale a \"query\""
+#: src/commandhandler.cpp:256
+msgid "Command: /q <nick>"
+msgstr "Comando: /q <nick>"
 
-#: ../src/commandhandler.cpp:178
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Apre una scheda per i messaggi privati con un altro utente"
+#: src/commandhandler.cpp:257
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+msgstr ""
+"Questo comando tenta di creare una scheda per i sussurri tra te e l'utente "
+"<nick>."
 
-#: ../src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Abbandona un canale"
+#: src/commandhandler.cpp:262
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Comando: /create <nome-gruppo>"
 
-#: ../src/commandhandler.cpp:194
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record> Inizia la registrazione della chat in un file esterno"
+#: src/commandhandler.cpp:263
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Questi comandi creano un nuovo gruppo chiamato <nome-gruppo>."
 
-#: ../src/commandhandler.cpp:196
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Determina se <invio> apre/chiude il registro della chat"
+#: src/commandhandler.cpp:267
+msgid "Command: /party <nick>"
+msgstr "Comando: /party <nick>"
 
-#: ../src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Setta l'argomento del canale corrente"
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Questo comando invita <nick> nel tuo party."
 
-#: ../src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+#: src/commandhandler.cpp:274
+msgid "Command: /present"
+msgstr "Comando: /present"
 
-#: ../src/commandhandler.cpp:186
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:275
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
 msgstr ""
+"Questo comando crea una lista dei giocatori che hai attorno e la invia o "
+"alla registrazione della chat se attivata, o alla chat altrimenti."
 
-#: ../src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Lista gli utenti nel canale corrente"
-
-#: ../src/commandhandler.cpp:177
-msgid "/w > Alias of msg"
-msgstr "/w > Equivale a \"msg\""
-
-#: ../src/commandhandler.cpp:169
-msgid "/where > Display map name"
-msgstr "/where > Mostra il nome della mappa"
+#: src/commandhandler.cpp:281
+msgid "Command: /record <filename>"
+msgstr "Comando: /record <nome file>"
 
-#: ../src/commandhandler.cpp:176
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Equivale a \"msg\""
+#: src/commandhandler.cpp:282
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr "Questo comando attiva la registrazione della chat nel file <nome file>"
 
-#: ../src/commandhandler.cpp:170
-msgid "/who > Display number of online users"
-msgstr "/who > Mostra il numero di utenti in linea"
+#: src/commandhandler.cpp:284
+msgid "Command: /record"
+msgstr "Comando: /record"
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr ""
+#: src/commandhandler.cpp:285
+msgid "This command finishes a recording session."
+msgstr "Questo comando termina la sessione di registrazione."
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr ""
+#: src/commandhandler.cpp:289
+msgid "Command: /toggle <state>"
+msgstr "Comando: /toggle <stato>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/commandhandler.cpp:290
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
-"<politica> può essere uno fra \"1\", \"yes\", \"true\" per abilitare la "
-"condivisione degli oggetti o \"0\", \"no\", \"false\" per disabilitarla."
+"Questo comando imposta la chiusura del registro della conversazione premendo "
+"il tasto Invio oppure automaticamente."
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -438,3678 +380,3618 @@ msgstr ""
 "<stato> può essere \"1\", \"yes\", \"true\" per attivarlo, oppure \"0\", \"no"
 "\", \"false\" per disattivarlo."
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ""
+#: src/commandhandler.cpp:295
+msgid "Command: /toggle"
+msgstr "Comando: /toggle"
 
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: src/commandhandler.cpp:296
+msgid "This command displays the return toggle status."
+msgstr "Questo comando mostra se il tasto Invio è attivato o meno."
 
-#: ../src/gui/socialwindow.cpp:566
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
-msgid "Accept Guild Invite"
-msgstr "Accetta invito nel party"
+msgid "Command: /unignore <player>"
+msgstr "Comando: /item <politica>"
 
-#: ../src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Accetta invito nel party"
+#: src/commandhandler.cpp:301
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:466
-#, fuzzy, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Invito accettato da %s."
+#: src/commandhandler.cpp:306
+msgid "Command: /where"
+msgstr "Comando: /where"
 
-#: ../src/gui/socialwindow.cpp:447
-#, fuzzy, c-format
-msgid "Accepted party invite from %s."
-msgstr "Invito accettato da %s."
+#: src/commandhandler.cpp:307
+msgid "This command displays the name of the current map."
+msgstr "Questo comando mostra il nome della mappa attuale."
 
-#: ../src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Le richieste di scambio in arrivo saranno accettate"
+#: src/commandhandler.cpp:311
+msgid "Command: /who"
+msgstr "Comando: /who"
 
-#: ../src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
+#: src/commandhandler.cpp:312
+msgid "This command displays the number of players currently online."
+msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
+
+#: src/commandhandler.cpp:318
+msgid "Type /help for a list of commands."
+msgstr "Digitare /help per una lista dei comandi."
+
+#: src/commandhandler.cpp:384
+msgid "Cannot send empty whispers!"
+msgstr "Impossibile inviare un sussurro vuoto!"
+
+#: src/commandhandler.cpp:392
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
+"Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
+"sei tu."
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
+#: src/commandhandler.cpp:406
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Richiesta per accedere al canale %s."
+
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Manca il nome del party."
+
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
+msgid "Please specify a name."
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Gestione dell'account e del personaggio"
+#: src/commandhandler.cpp:450
+msgid "Return toggles chat."
+msgstr "Invio attiva/disattiva la conversazione."
 
-#: ../src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Account banned"
-msgstr "Account scaduto"
+#: src/commandhandler.cpp:450
+msgid "Message closes chat."
+msgstr "I messaggi chiudono la conversazione."
 
-#: ../src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Account banned."
-msgstr "Account scaduto"
+#: src/commandhandler.cpp:459
+msgid "Return now toggles chat."
+msgstr "\"Invio\" adesso attiva/disattiva la conversazione."
 
-#: ../src/net/tmwa/loginhandler.cpp:162
-#, fuzzy
-msgid "Account expired."
-msgstr "Account scaduto"
+#: src/commandhandler.cpp:463
+msgid "Message now closes chat."
+msgstr "I messaggi adesso chiudono la conversazione."
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
 msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Account non trovato. Perfavore riesegui il login."
-
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
-msgstr "Account: %s"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
 
-#: ../src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Aggiungi"
+#: src/commandhandler.cpp:515
+msgid "Player already ignored!"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:171
+#: src/commandhandler.cpp:522
 #, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|Aggiungi nome alla conversazione@@"
+msgid "Player successfully ignored!"
+msgstr "Party creato con successo."
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
+#: src/commandhandler.cpp:524
 #, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Aggiungi alla chat@@"
+msgid "Player could not be ignored!"
+msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Agilità"
+#: src/commandhandler.cpp:539
+msgid "Player wasn't ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:544
+msgid "Player no longer ignored!"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
+#: src/commandhandler.cpp:546
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
+
+#: src/commandhandler.h:31
 #, c-format
-msgid "Agility %+d"
-msgstr "Agilità %+d"
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false"
+"\" (falso), \"1\", \"0\"."
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Agilità:"
+#: src/game.cpp:172
+msgid "General"
+msgstr "Generale"
 
-#: ../src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Accetta scambio"
+#: src/game.cpp:342
+#, fuzzy
+msgid "Screenshot saved as "
+msgstr "Schermata salvata in ~/"
 
-#: ../src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Accettato. In attesa..."
+#: src/game.cpp:347
+msgid "Saving screenshot failed!"
+msgstr "Salvataggio della schermata fallito!"
 
-#: ../src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "Tutti"
+#: src/game.cpp:378
+#, fuzzy
+msgid "The connection to the server was lost."
+msgstr "La connessione al server è caduta. Il programma sarà ora chiuso."
 
-#: ../src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Permetti scambi"
+#: src/game.cpp:382
+msgid "Network Error"
+msgstr "Errore di rete"
 
-#: ../src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Permetti sussurri"
+#: src/game.cpp:721
+msgid "Ignoring incoming trade requests"
+msgstr "Le richieste di scambio in arrivo saranno ignorate"
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
-msgid "Already logged in."
-msgstr "La registrazione è già in corso."
+#: src/game.cpp:726
+msgid "Accepting incoming trade requests"
+msgstr "Le richieste di scambio in arrivo saranno accettate"
 
-#: ../src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "La registrazione è già in corso."
+#: src/game.cpp:954
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Impossibile caricare la mappa"
 
-#: ../src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Suoni ambientali"
+#: src/game.cpp:955
+#, c-format
+msgid "Error while loading %s"
+msgstr "Errore durante il caricamento di %s"
 
-#: ../src/gui/debugwindow.cpp:121
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "Suoni ambientali"
+msgid "Party: %s"
+msgstr "Party (%s)"
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Compra"
+
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
-msgid "An unknown member tried to say: %s"
+msgid "Price: %s / Total: %s"
+msgstr "Prezzo: %s / Totale: %s"
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
+msgid "+"
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Annichilito."
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
+msgid "-"
+msgstr ""
 
-#: ../src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Applica"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Esci"
 
-#: ../src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
+msgid "Max"
+msgstr "Massimo"
 
-#: ../src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
-msgstr ""
+#: src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Negozio"
 
-#: ../src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Sei sicuro di voler cancellare questo personaggio?"
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Vendi"
 
-#: ../src/gui/socialwindow.cpp:168
-#, fuzzy, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Sei sicuro di voler uscire?"
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Annulla"
 
-#: ../src/gui/socialwindow.cpp:247
-#, fuzzy, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Sei sicuro di voler uscire?"
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Cambia l'indirizzo Email"
 
-#: ../src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Imposta"
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#, c-format
+msgid "Account: %s"
+msgstr "Account: %s"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Attacco"
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
+msgstr "Inserire il nuovo indirizzo email due volte:"
 
-#: ../src/resources/itemdb.cpp:53
-#, c-format
-msgid "Attack %+d"
-msgstr "Attacco %+d"
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Il nome utente deve contenere almeno %d caratteri."
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: src/gui/changeemaildialog.cpp:134
 #, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Attacco %+d"
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Il nome utente deve avere meno di %d caratteri."
 
-#: ../src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "Numero dei presenti registrato."
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "Il nuovo indirizzo e-mail esiste già."
 
-#: ../src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Audio"
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
+msgid "Change Password"
+msgstr "Cambia la Password"
 
-#: ../src/net/tmwa/generalhandler.cpp:129
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Password:"
+
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
-msgid "Authentication failed."
-msgstr "Autenticazione non riuscita"
+msgid "Type new password twice:"
+msgstr "Inserire la nuova password due volte:"
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:100
+#: src/gui/changepassworddialog.cpp:116
 #, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|Amico con %s@@"
+msgid "The new password needs to be at least %d characters long."
+msgstr "La password deve essere lunga almeno %d caratteri."
 
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Essere"
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "La password deve contenere meno di %d caratteri."
 
-#: ../src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Privato della vita, riposi in pace."
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
 
-#: ../src/playerrelations.cpp:342
-msgid "Blink name"
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Crea Personaggio"
+
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Nome:"
+
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:138
-#, fuzzy
-msgid "Blue:"
-msgstr "Blu: "
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Nuvolette con nomi"
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
+msgstr "Colore Capelli:"
 
-#: ../src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Nuvolette senza nomi"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
+msgstr "Stile Capelli:"
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Compra"
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
+msgid "Create"
+msgstr "Crea"
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Calibra"
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "Maschio"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Annulla"
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "Femmina"
 
-#: ../src/commandhandler.cpp:422
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
-"sei tu."
+msgid "Please distribute %d points"
+msgstr "Distribuire %d punti"
 
-#: ../src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
-#: ../src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
+msgstr "Statistiche personaggio OK"
 
-#: ../src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "Non puoi inviare un messaggio vuoto!"
+#: src/gui/charcreatedialog.cpp:256
+#, c-format
+msgid "Please remove %d points"
+msgstr "Rimuovere %d punti"
 
-#: ../src/commandhandler.cpp:401
-msgid "Cannot send empty whispers!"
-msgstr "Impossibile inviare un sussurro vuoto!"
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Conferma la cancellazione del personaggio"
 
-#: ../src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr ""
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "Impossibile usare questo ID"
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr "Gestione dell'account e del personaggio"
 
-#: ../src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Cambia"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Cancella registrazione"
 
-#: ../src/gui/charselectdialog.cpp:150
+#: src/gui/charselectdialog.cpp:150
 #, fuzzy
 msgid "Change Email"
 msgstr "Cambia l'indirizzo Email"
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Cambia l'indirizzo Email"
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Elimina"
 
-#: ../src/gui/worldselectdialog.cpp:76
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
-msgid "Change Login"
-msgstr "Cambia"
+msgid "Choose"
+msgstr "Chiudi"
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Cambia la Password"
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
+msgid "(empty)"
+msgstr ""
 
-#: ../src/gui/login.cpp:62
-#, fuzzy
-msgid "Change Server"
-msgstr "Server"
+#: src/gui/chat.cpp:88
+msgid "Chat"
+msgstr "Chat"
 
-#: ../src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "I cambi saranno effettuati al cambio della mappa."
+#: src/gui/chat.cpp:311
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
+msgstr "Sono presenti %d giocatori."
 
-#: ../src/client.cpp:813
-#, fuzzy
-msgid "Changing game servers"
-msgstr "Server"
+#: src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Numero dei presenti registrato."
 
-#: ../src/gui/setup_video.cpp:460
-#, fuzzy
-msgid "Changing to OpenGL"
-msgstr "Modifica OpenGL"
+#: src/gui/chat.cpp:493
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Sussurra a %s: %s"
 
-#: ../src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Sì"
+
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "No"
+
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
 msgstr ""
-"Gli operatori possono rendere operatiori o cacciare gli altri utenti dal "
-"canale."
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "I canali non sono supportati!"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Personaggio cancellato."
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: ../src/gui/statuswindow.cpp:238
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
 #, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Statistiche personaggio OK"
+msgid "Map: %s"
+msgstr "Nome: %s"
 
-#: ../src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Statistiche personaggio OK"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "Mini mappa"
 
-#: ../src/net/manaserv/charhandler.cpp:143
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Nome utente già esistente"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:155
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Statistiche personaggio OK"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Effetti particelle"
 
-#: ../src/net/manaserv/charhandler.cpp:158
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Statistiche personaggio OK"
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Dettagli particelle"
 
-#: ../src/gui/chat.cpp:87
-msgid "Chat"
-msgstr "Chat"
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Suoni ambientali"
 
-#: ../src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Finestra della Chat"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Equipaggiamento"
 
-#: ../src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Creazione della chat fallita!"
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
+msgid "Unequip"
+msgstr "Rimuovi"
 
-#: ../src/gui/charselectdialog.cpp:380
-#, fuzzy
-msgid "Choose"
+#: src/gui/help.cpp:37
+msgid "Help"
+msgstr "Aiuto"
+
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
+msgid "Close"
 msgstr "Chiudi"
 
-#: ../src/gui/worldselectdialog.cpp:77
-#, fuzzy
-msgid "Choose World"
-msgstr "Scegliere il proprio server"
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inventario"
 
-#: ../src/gui/serverdialog.cpp:196
-#, fuzzy
-msgid "Choose Your Server"
-msgstr "Scegliere il proprio server"
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Storage"
 
-#: ../src/gui/socialwindow.cpp:544
-#, fuzzy
-msgid "Choose your guild's name."
-msgstr "Scegliere il proprio server"
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Slot:"
 
-#: ../src/gui/socialwindow.cpp:630
-#, fuzzy
-msgid "Choose your party's name."
-msgstr "Scegliere il proprio server"
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
+msgid "Equip"
+msgstr "Equipaggia"
 
-#: ../src/gui/npcdialog.cpp:98
-msgid "Clear log"
-msgstr ""
+#: src/gui/inventorywindow.cpp:88
+msgid "Use"
+msgstr "Usa"
 
-#: ../src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
-msgid "Client version is too old."
-msgstr "La varsione del client è troppo vecchia"
-
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
-msgid "Close"
-msgstr "Chiudi"
+msgid "Drop..."
+msgstr "Lascia"
 
-#: ../src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Colori"
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
+msgid "Split"
+msgstr "Dividi"
 
-#: ../src/commandhandler.cpp:221
-msgid "Command: /announce <msg>"
-msgstr "Comando: /announce <msg>"
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
 
-#: ../src/commandhandler.cpp:274
-#, fuzzy
-msgid "Command: /away"
-msgstr "Comando: /who"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
+msgstr "Peso:"
 
-#: ../src/commandhandler.cpp:271
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Comando: /w <nick> <messaggio>"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr ""
 
-#: ../src/commandhandler.cpp:228
-msgid "Command: /clear"
-msgstr "Comando: /clear"
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Recupera"
 
-#: ../src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Comando: /close"
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
+msgid "Drop"
+msgstr "Lascia"
 
-#: ../src/commandhandler.cpp:279
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Comando: /create <nome-gruppo>"
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
+msgid "OK"
+msgstr "OK"
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Comando: /exp"
+#: src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Tutti"
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr ""
+#: src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Seleziona la quantità di oggetti da scambiare."
 
-#: ../src/commandhandler.cpp:209
-msgid "Command: /help"
-msgstr "Comando: /help"
+#: src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Seleziona la quantità di oggetti da lasciare."
 
-#: ../src/commandhandler.cpp:212
-msgid "Command: /help <command>"
-msgstr "Comando: /help <comando>"
+#: src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Selezionare la quantità di oggetti da riporre."
 
-#: ../src/gui/widgets/whispertab.cpp:88
-#, fuzzy
-msgid "Command: /ignore"
-msgstr "Comando: /item"
+#: src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Seleziona la quantità di oggetti da ritirare"
 
-#: ../src/commandhandler.cpp:233
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Comando: /item <politica>"
+#: src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Seleziona la quantità di oggetti da dividere."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Comando: /invite <nick>"
+#: src/gui/itempopup.cpp:137
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Peso: "
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Comando: /item"
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
+msgid "Login"
+msgstr "Autenticazione"
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Comando: /item <politica>"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Remember username"
+msgstr "Ricorda nome utente"
 
-#: ../src/commandhandler.cpp:239
-msgid "Command: /join <channel>"
-msgstr "Comando: /join <canale>"
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "Registra"
 
-#: ../src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Comando: /kick <nick>"
+#: src/gui/login.cpp:62
+#, fuzzy
+msgid "Change Server"
+msgstr "Server"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Comando: /leave"
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Disabilitata la condivisione degli oggetti"
 
-#: ../src/commandhandler.cpp:245
-msgid "Command: /list"
-msgstr "Comando: /list"
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
 
-#: ../src/commandhandler.cpp:250
-msgid "Command: /me <message>"
-msgstr "Comando: /me <messaggio>"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Mappa"
 
-#: ../src/commandhandler.cpp:255
-msgid "Command: /msg <nick> <message>"
-msgstr "Comando: /msg <nick> <messaggio>"
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Comando: /op <nick>"
+#: src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "In attesa del server"
 
-#: ../src/commandhandler.cpp:284
-msgid "Command: /party <nick>"
-msgstr "Comando: /party <nick>"
+#: src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Prossimo"
 
-#: ../src/commandhandler.cpp:291
-msgid "Command: /present"
-msgstr "Comando: /present"
+#: src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Invia"
 
-#: ../src/commandhandler.cpp:265
-msgid "Command: /q <nick>"
-msgstr "Comando: /q <nick>"
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: ../src/commandhandler.cpp:264
-msgid "Command: /query <nick>"
-msgstr "Comando: /query <nick>"
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Comando: /quit"
+#: src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Reimposta"
 
-#: ../src/commandhandler.cpp:301
-msgid "Command: /record"
-msgstr "Comando: /record"
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:208
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Prossimo"
 
-#: ../src/commandhandler.cpp:298
-msgid "Command: /record <filename>"
-msgstr "Comando: /record <nome file>"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "A:"
 
-#: ../src/commandhandler.cpp:312
-msgid "Command: /toggle"
-msgstr "Comando: /toggle"
+#: src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Invia"
 
-#: ../src/commandhandler.cpp:306
-msgid "Command: /toggle <state>"
-msgstr "Comando: /toggle <stato>"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "La lettera non è valida oppure non è stato possibile inviarla."
 
-#: ../src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Comando: /topic <messaggio>"
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
+#: src/gui/outfitwindow.cpp:70
 #, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Comando: /item <politica>"
+msgid "Unequip first"
+msgstr "Rimuovi"
 
-#: ../src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Comando: /users"
+#: src/gui/popupmenu.cpp:83
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Commerciando con %s"
 
-#: ../src/commandhandler.cpp:257
-msgid "Command: /w <nick> <message>"
-msgstr "Comando: /w <nick> <messaggio>"
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Attacco %+d"
 
-#: ../src/commandhandler.cpp:323
-msgid "Command: /where"
-msgstr "Comando: /where"
+#: src/gui/popupmenu.cpp:91
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Sussurro"
 
-#: ../src/commandhandler.cpp:256
-msgid "Command: /whisper <nick> <message>"
-msgstr "Comando: /whisper <nick> <messaggio>"
+#: src/gui/popupmenu.cpp:100
+#, fuzzy, c-format
+msgid "Befriend %s"
+msgstr "@@friend|Amico con %s@@"
 
-#: ../src/commandhandler.cpp:328
-msgid "Command: /who"
-msgstr "Comando: /who"
+#: src/gui/popupmenu.cpp:105
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Disprezzato"
 
-#: ../src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Completato"
+#: src/gui/popupmenu.cpp:108
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Ignorato"
 
-#: ../src/playerrelations.cpp:312
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Ignora completamente %s@@"
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:117
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Ignora completamente %s@@"
 
-#: ../src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Conferma la cancellazione del personaggio"
-
-#: ../src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Conferma:"
-
-#: ../src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Confermato. In attesa..."
+#: src/gui/popupmenu.cpp:130
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
+msgstr "@@guild|Invita %s ad entrare nella tua gilda@@"
 
-#: ../src/keyboardconfig.cpp:184
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Se non vengono risolti, il gioco potrebbe comportarsi in modo inaspettato."
+msgid "Invite %s to join your party"
+msgstr "@@party|Invita %s ad entrare nel tuo party@@"
 
-#: ../src/gui/serverdialog.cpp:233
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
-msgid "Connect"
-msgstr "Connessione..."
+msgid "Kick player"
+msgstr "Espulsione fallita!"
 
-#: ../src/client.cpp:655
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Connessione al server della mappa..."
+#: src/gui/popupmenu.cpp:150
+#, fuzzy, c-format
+msgid "Talk to %s"
+msgstr "@@talk|Parla a %s@@"
 
-#: ../src/client.cpp:803
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
-msgid "Connecting to the game server"
-msgstr "Connessione al server della mappa..."
-
-#: ../src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Connessione..."
+msgid "Kick monster"
+msgstr "@@admin-kick|Espelli mostro@@"
 
-#: ../src/net/tmwa/network.cpp:414
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Connessione al server della mappa..."
-
-#: ../src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr ""
+msgid "Add name to chat"
+msgstr "@@name|Aggiungi nome alla conversazione@@"
 
-#: ../src/gui/statuswindow.cpp:244
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Punti abilità: %d"
+msgid "Pick up %s"
+msgstr "Raccogli"
 
-#: ../src/game.cpp:950
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
-msgid "Could Not Load Map"
-msgstr "Impossibile caricare la mappa"
+msgid "Add to chat"
+msgstr "@@chat|Aggiungi alla chat@@"
 
-#: ../src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "Non puoi creare un party."
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Cambia server"
 
-#: ../src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
-msgstr ""
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Cambia personaggio"
 
-#: ../src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Non puoi unirti al party!"
+#: src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Registrazione terminata."
 
-#: ../src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr ""
+#: src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Nessuna registrazione in corso."
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Crea"
+#: src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "La registrazione è già in corso."
 
-#: ../src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Crea Personaggio"
+#: src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Inizio registrazione..."
 
-#: ../src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Crea una Gilda"
+#: src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Impossibile iniziare la registrazione."
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
-#, fuzzy
-msgid "Create Party"
-msgstr "Crea Personaggio"
+#: src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Registrazione..."
 
-#: ../src/gui/socialwindow.cpp:507
-#, fuzzy, c-format
-msgid "Creating guild called %s."
-msgstr "Errore durante la creazione della gilda."
+#: src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Ferma registrazione"
 
-#: ../src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Conferma:"
+
+#: src/gui/register.cpp:100
+msgid "Email:"
+msgstr "Email:"
 
-#: ../src/gui/socialwindow.cpp:529
+#: src/gui/register.cpp:166
 #, c-format
-msgid "Creating party called %s."
-msgstr ""
+msgid "The username needs to be at least %d characters long."
+msgstr "Il nome utente deve contenere almeno %d caratteri."
 
-#: ../src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Il nome utente deve avere meno di %d caratteri."
 
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Colpo critico"
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "La password deve essere lunga almeno %d caratteri."
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+msgid "The password needs to be less than %d characters long."
+msgstr "La password deve contenere meno di %d caratteri."
 
-#: ../src/gui/serverdialog.cpp:234
-#, fuzzy
-msgid "Custom Server"
-msgstr "Cursore personalizzato"
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Le password non corrispondono."
 
-#: ../src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "Cursore personalizzato"
+#: src/gui/serverdialog.cpp:197
+#, fuzzy
+msgid "Choose Your Server"
+msgstr "Scegliere il proprio server"
 
-#: ../src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
-msgstr ""
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Server:"
 
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr ""
+#: src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Porta:"
 
-#: ../src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Finestra di debug"
+#: src/gui/serverdialog.cpp:208
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
 
-#: ../src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Predefinito"
+#: src/gui/serverdialog.cpp:229
+#, fuzzy
+msgid "Connect"
+msgstr "Connessione..."
 
-#: ../src/net/tmwa/generalhandler.cpp:225
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
-msgid "Defense"
-msgstr "Difesa:"
+msgid "Custom Server"
+msgstr "Cursore personalizzato"
 
-#: ../src/resources/itemdb.cpp:54
+#: src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Per favore inserisci l'indirizzo e la porta del server."
+
+#: src/gui/serverdialog.cpp:441
 #, c-format
-msgid "Defense %+d"
-msgstr "Difesa %+d"
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:93
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
-msgid "Delay:"
-msgstr "Ritardo: "
+msgid "Waiting for server..."
+msgstr "In attesa del server"
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Elimina"
+#: src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Destrezza"
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: src/gui/serverdialog.cpp:552
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Destrezza %+d"
+msgid "requires v%s"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Destrezza:"
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Suono"
 
-#: ../src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:105
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "Disprezzato"
+#: src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Audio"
 
-#: ../src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Disprezzato"
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Volume effetti sonori"
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr ""
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Volume musica"
 
-#: ../src/gui/setup_audio.cpp:43
-msgid "Download music"
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Nessun testo"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:442
-#, c-format
-msgid "Downloading server list...%2.2f%%"
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
-msgid "Drop"
-msgstr "Lascia"
+#: src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "Come appaiono i colori"
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
-#, fuzzy
-msgid "Drop..."
-msgstr "Lascia"
+#: src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Colori"
 
-#: ../src/net/tmwa/generalhandler.cpp:145
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
-msgid "Duplicated login."
-msgstr "Accesso duplicato"
+msgid "Type:"
+msgstr "Tipo: "
+
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Statico"
 
-#: ../src/client.cpp:905
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Pulsazione"
+
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Arcobaleno"
+
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Gamma"
+
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
-msgid "Email Change"
-msgstr "Cambia"
+msgid "Delay:"
+msgstr "Ritardo: "
 
-#: ../src/net/manaserv/loginhandler.cpp:309
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Indirizzo email già esistente"
+msgid "Red:"
+msgstr "Rosso: "
 
-#: ../src/client.cpp:906
-msgid "Email changed successfully!"
-msgstr ""
+#: src/gui/setup_colors.cpp:124
+#, fuzzy
+msgid "Green:"
+msgstr "Verde: "
 
-#: ../src/gui/register.cpp:100
-msgid "Email:"
-msgstr "Email:"
+#: src/gui/setup_colors.cpp:139
+#, fuzzy
+msgid "Blue:"
+msgstr "Blu: "
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Applica"
 
-#: ../src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr ""
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Resetta finestre"
 
-#: ../src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr ""
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Premi il pulsante per cominciare la calibrazione"
 
-#: ../src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Calibra"
 
-#: ../src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr "Abilita joystick"
 
-#: ../src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Abilita/Disabilita Scambi"
-
-#: ../src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: ../src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr ""
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: ../src/client.cpp:715
-msgid "Entering game world"
-msgstr ""
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Ferma"
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
-msgid "Equip"
-msgstr "Equipaggia"
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Ruota la manopola"
 
-#: ../src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
-msgstr "Equipaggia prima le frecce"
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Tastiera"
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Equipaggiamento"
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Imposta"
 
-#: ../src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Finestra dell'Equipaggiamento"
+#: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Imposta"
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "Errore"
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Predefinito"
 
-#: ../src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Errore durante la creazione della gilda."
+#: src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Sono stati rilevati conflitti nei tasti."
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
-msgid "Error creating updates directory!"
-msgstr "Errore durante la creazione della directory degli aggiornamenti"
+#: src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Nome"
 
-#: ../src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Comando: /join <canale>"
+#: src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Relazione"
 
-#: ../src/gui/serverdialog.cpp:456
-msgid "Error retreiving server list!"
-msgstr ""
+#: src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutrale"
 
-#: ../src/game.cpp:951
-#, c-format
-msgid "Error while loading %s"
-msgstr "Errore durante il caricamento di %s"
+#: src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Amico"
 
-#: ../src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "Esperienza:"
+#: src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Disprezzato"
 
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "Notifica Esperienza"
+#: src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Ignorato"
 
-#: ../src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "Esperienza:"
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
+msgid "???"
+msgstr "???"
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr "Disabilitata la condivisione dell'esperienza."
+#: src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Permetti scambi"
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr "Abilitata la condivisione dell'esperienza."
+#: src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Permetti sussurri"
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr "Impossibile condividere l'esperienza."
+#: src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Sposta tutti i sussurri in schede"
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
+#: src/gui/setup_players.cpp:233
 #, fuzzy
-msgid "Experience sharing unknown."
-msgstr "Abilitata la condivisione dell'esperienza."
+msgid "Show gender"
+msgstr "Mostra nomi"
 
-#: ../src/gui/setup_video.cpp:238
+#: src/gui/setup_players.cpp:235
 #, fuzzy
-msgid "FPS limit:"
-msgstr "Limita FPS:"
+msgid "Enable Chat log"
+msgstr "Impossibile vendere."
 
-#: ../src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr ""
+#: src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Giocatori"
 
-#: ../src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
+#: src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "Quando si ignora:"
 
-#: ../src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
+#: src/gui/setup_video.cpp:134
+msgid "Tiny"
+msgstr "Minuscolo"
 
-#: ../src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
-"finestra."
+#: src/gui/setup_video.cpp:135
+msgid "Small"
+msgstr "Piccolo"
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Creazione del personaggio fallita. E' molto probabile che il nome sia già "
-"stato preso."
+#: src/gui/setup_video.cpp:136
+msgid "Medium"
+msgstr "Medio"
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "Cancellazione del personaggio fallita."
+#: src/gui/setup_video.cpp:137
+msgid "Large"
+msgstr "Largo"
 
-#: ../src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
+#: src/gui/setup_video.cpp:163
+msgid "No text"
+msgstr "Nessun testo"
 
-#: ../src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "La lettera non è valida oppure non è stato possibile inviarla."
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Testo"
 
-#: ../src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Impossibile iniziare la registrazione."
+#: src/gui/setup_video.cpp:165
+msgid "Bubbles, no names"
+msgstr "Nuvolette senza nomi"
 
-#: ../src/gui/setup_video.cpp:434
-#, fuzzy
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "e il ripristino della precedente è fallito."
+#: src/gui/setup_video.cpp:166
+msgid "Bubbles with names"
+msgstr "Nuvolette con nomi"
 
-#: ../src/gui/setup_video.cpp:428
-#, fuzzy
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "e il ripristino della precedente è fallito."
+#: src/gui/setup_video.cpp:178
+msgid "off"
+msgstr "Spento"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
-msgid "Failed to use item."
-msgstr ""
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
+msgid "low"
+msgstr "Basso"
 
-#: ../src/client.cpp:927
-msgid "Farewell, come back any time..."
-msgstr ""
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
+msgid "high"
+msgstr "Alto"
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
-msgid "Female"
-msgstr "Femmina"
+#: src/gui/setup_video.cpp:193
+msgid "medium"
+msgstr "medio"
 
-#: ../src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "Trova il percorso sino al mouse"
+#: src/gui/setup_video.cpp:195
+msgid "max"
+msgstr "massimo"
 
-#: ../src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Registrazione terminata."
+#: src/gui/setup_video.cpp:217
+msgid "Full screen"
+msgstr "Schermo intero"
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:218
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:219
+msgid "Custom cursor"
+msgstr "Cursore personalizzato"
 
-#: ../src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Dimensione caratteri"
+#: src/gui/setup_video.cpp:221
+msgid "Visible names"
+msgstr "Nomi visibili"
 
-#: ../src/commandhandler.cpp:205
-msgid "For more information, type /help <command>."
-msgstr "Per maggiori informazioni, digitare /help <comando>."
+#: src/gui/setup_video.cpp:223
+msgid "Particle effects"
+msgstr "Effetti particelle"
 
-#: ../src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Amico"
+#: src/gui/setup_video.cpp:225
+#, fuzzy
+msgid "Show own name"
+msgstr "Mostra nomi"
 
-#: ../src/gui/setup_video.cpp:219
-msgid "Full screen"
-msgstr "Schermo intero"
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
 
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "Nomi dei GM"
+#: src/gui/setup_video.cpp:227
+msgid "Show pickup notification"
+msgstr ""
 
-#: ../src/net/tmwa/gamehandler.cpp:101
-#, fuzzy
-msgid "Game"
-msgstr "Nome"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
+msgid "in chat"
+msgstr "in chat"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
+msgid "as particle"
 msgstr ""
 
-#: ../src/game.cpp:169
-msgid "General"
-msgstr "Generale"
-
-#: ../src/gui/widgets/chattab.cpp:126
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Annuncio generale da %s:"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "FPS limit:"
+msgstr "Limita FPS:"
 
-#: ../src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Annuncio generale:"
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
-msgstr "Disconnesso dal server!"
+#: src/gui/setup_video.cpp:250
+msgid "Video"
+msgstr "Video"
 
-#: ../src/gui/setup_colors.cpp:123
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Green:"
-msgstr "Verde: "
+msgid "Show damage"
+msgstr "Mostra nomi"
+
+#: src/gui/setup_video.cpp:258
+msgid "Overhead text"
+msgstr "Testo sovrastante"
 
-#: ../src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Opacità IU"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Gilda"
-
-#: ../src/gui/socialwindow.cpp:143
-#, fuzzy, c-format
-msgid "Guild %s quit requested."
-msgstr "La gilda è stata creata."
-
-#: ../src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Gilda"
+#: src/gui/setup_video.cpp:260
+msgid "Ambient FX"
+msgstr "Suoni ambientali"
 
-#: ../src/gui/socialwindow.cpp:543
+#: src/gui/setup_video.cpp:261
 #, fuzzy
-msgid "Guild Name"
-msgstr "Gilda"
-
-#: ../src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "La gilda è stata creata."
+msgid "Particle detail"
+msgstr "Dettagli particelle"
 
-#: ../src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
-msgstr ""
+#: src/gui/setup_video.cpp:262
+msgid "Font size"
+msgstr "Dimensione caratteri"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
-msgid "Guild name is missing."
-msgstr "Manca il nome del party."
+msgid "None"
+msgstr "No"
 
-#: ../src/gui/statuswindow.cpp:203
+#: src/gui/setup_video.cpp:426
 #, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: ../src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "PF %+d"
-
-#: ../src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "HP:"
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "e il ripristino della precedente è fallito."
 
-#: ../src/gui/charcreatedialog.cpp:74
+#: src/gui/setup_video.cpp:432
 #, fuzzy
-msgid "Hair color:"
-msgstr "Colore Capelli:"
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr "e il ripristino della precedente è fallito."
 
-#: ../src/gui/charcreatedialog.cpp:77
+#: src/gui/setup_video.cpp:443
 #, fuzzy
-msgid "Hair style:"
-msgstr "Stile Capelli:"
+msgid "Switching to Full Screen"
+msgstr "Modalità a schermo intero"
 
-#: ../src/gui/help.cpp:37
-msgid "Help"
-msgstr "Aiuto"
+#: src/gui/setup_video.cpp:444
+msgid "Restart needed for changes to take effect."
+msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: ../src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Finestra di Aiuto"
+#: src/gui/setup_video.cpp:458
+#, fuzzy
+msgid "Changing to OpenGL"
+msgstr "Modifica OpenGL"
 
-#: ../src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Nascondi la Finestra"
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Huh? Cos'è quello?"
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Suppongo non sia andata troppo bene."
+#: src/gui/setup_video.cpp:467
+msgid "Applying change to OpenGL requires restart."
+msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: ../src/commandhandler.cpp:241
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Se il <canale> non esiste, viene creato."
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Disabilitata la condivisione dell'esperienza."
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Se il <nick> contiene spazi, racchiuderlo tra virgolette (\")."
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Se sei l'ultima persona nel canale, questo sarà cancellato."
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
+#, fuzzy
+msgid "Screen Resolution Changed"
+msgstr "Risoluzione schermo modificata"
 
-#: ../src/gui/popupmenu.cpp:108
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "Ignorato"
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
+msgid "Restart your client for the change to take effect."
+msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
-#: ../src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "Ignora input 1"
+#: src/gui/setup_video.cpp:579
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "Ignora input 2"
+#: src/gui/setup_video.cpp:612
+#, fuzzy
+msgid "Particle Effect Settings Changed."
+msgstr "Impostazione effetti particelle modificato."
 
-#: ../src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Ignorato"
+#: src/gui/setup_video.cpp:613
+msgid "Changes will take effect on map change."
+msgstr "I cambi saranno effettuati al cambio della mappa."
 
-#: ../src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Le richieste di scambio in arrivo saranno ignorate"
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Abilità"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignora la richiesta di commercio."
+#: src/gui/skilldialog.cpp:223
+msgid "Up"
+msgstr "Su"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Informazioni"
+#: src/gui/skilldialog.cpp:269
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Punti abilità: %d"
 
-#: ../src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "Inserisci un gettone per continuare."
+#: src/gui/skilldialog.cpp:351
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Punti abilità: %d"
 
-#: ../src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "HP insufficienti!"
+#: src/gui/skilldialog.cpp:360
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Abilità"
 
-#: ../src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "SP insufficienti!"
+#: src/gui/skilldialog.cpp:442
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Livello: %d"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Intelligenza"
+#: src/gui/skilldialog.cpp:453
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Livello: %d"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
+#: src/gui/socialwindow.cpp:126
 #, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligenza %+d"
-
-#: ../src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Intelligenza:"
-
-#: ../src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
-msgstr ""
+#: src/gui/socialwindow.cpp:139
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "La gilda è stata creata."
 
-#: ../src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
+#: src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
+#: src/gui/socialwindow.cpp:154
+#, c-format
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: ../src/client.cpp:1244
-#, fuzzy, c-format
-msgid "Invalid update host: %s"
-msgstr "Host di aggiornamento non valido: "
-
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inventario"
-
-#: ../src/keyboardconfig.cpp:72
-msgid "Inventory Window"
-msgstr "Finestra dell'Inventario"
-
-#: ../src/localplayer.cpp:1254
-#, fuzzy
-msgid "Inventory is full."
-msgstr "Il server è pieno"
-
-#: ../src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
-msgid "Invite"
-msgstr "Invita un utente"
-
-#: ../src/gui/popupmenu.cpp:130
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|Invita %s ad entrare nella tua gilda@@"
+msgid "Leave Guild?"
+msgstr "Crea una Gilda"
 
-#: ../src/gui/popupmenu.cpp:134
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|Invita %s ad entrare nel tuo party@@"
-
-#: ../src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Invito spedito."
-
-#: ../src/gui/socialwindow.cpp:128
-#, c-format
-msgid "Invited user %s to guild %s."
-msgstr ""
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Sei sicuro di voler uscire?"
 
-#: ../src/net/tmwa/partyhandler.cpp:335
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Invita un utente nel party"
 
-#: ../src/net/tmwa/partyhandler.cpp:340
+#: src/gui/socialwindow.cpp:218
 #, c-format
-msgid "Inviting failed, because you can't see a player called %s."
+msgid "Party %s quit requested."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Scorciatoia %d"
-
-#: ../src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Finestra Scorciatoia Oggetti"
+#: src/gui/socialwindow.cpp:232
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Invita un utente nel party"
 
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
+#: src/gui/socialwindow.cpp:233
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
+#: src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
-msgstr ""
+#: src/gui/socialwindow.cpp:243
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Sei sicuro di voler uscire?"
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Disabilitata la condivisione degli oggetti"
+#: src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Crea una Gilda"
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Abilitata la condivisione degli oggetti."
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
+#, fuzzy
+msgid "Create Party"
+msgstr "Crea Personaggio"
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "Impossibile condividere gli oggetti."
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:141
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
-msgid "Item sharing unknown."
-msgstr "Abilitata la condivisione degli oggetti."
+msgid "Invite"
+msgstr "Invita un utente"
 
-#: ../src/gui/statuswindow.cpp:234
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
-msgid "Job"
-msgstr "Lavoro:"
+msgid "Leave"
+msgstr "Largo"
 
-#: ../src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Lavoro:"
+#: src/gui/socialwindow.cpp:443
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Invito accettato da %s."
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
-#, c-format
-msgid "Job: %d"
-msgstr "Lavoro: %d"
+#: src/gui/socialwindow.cpp:449
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Invito rifiutato da %s."
 
-#: ../src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
+#: src/gui/socialwindow.cpp:462
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Invito accettato da %s."
 
-#: ../src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: src/gui/socialwindow.cpp:468
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Invito rifiutato da %s."
 
-#: ../src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Sono stati rilevati conflitti nei tasti."
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Tastiera"
+#: src/gui/socialwindow.cpp:504
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Errore durante la creazione della gilda."
 
-#: ../src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Espulsione fallita!"
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:163
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|Espelli mostro@@"
+msgid "Guild Name"
+msgstr "Gilda"
 
-#: ../src/gui/popupmenu.cpp:141
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
-msgid "Kick player"
-msgstr "Espulsione fallita!"
+msgid "Choose your guild's name."
+msgstr "Scegliere il proprio server"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Kick riuscito!"
+#: src/gui/socialwindow.cpp:554
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
-#: ../src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Largo"
+#: src/gui/socialwindow.cpp:559
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: ../src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
-msgid "Leave"
-msgstr "Largo"
+msgid "Accept Guild Invite"
+msgstr "Accetta invito nel party"
 
-#: ../src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:576
+msgid "Received party request, but one already exists."
+msgstr "Ricevuta richiesta di party, ma ne esiste già una."
+
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
-msgid "Leave Guild?"
-msgstr "Crea una Gilda"
+msgid "You have been invited you to join a party."
+msgstr "%s ti ha invitato ad unirti al suo party."
 
-#: ../src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
-msgstr ""
+#: src/gui/socialwindow.cpp:589
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: ../src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Livello: %d"
+#: src/gui/socialwindow.cpp:597
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s ti ha invitato ad unirti al suo party."
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/socialwindow.cpp:602
 #, c-format
-msgid "Level: %d"
-msgstr "Livello: %d"
+msgid "%s has invited you to join the %s party."
+msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: ../src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Richiesta per accedere al canale %s."
+#: src/gui/socialwindow.cpp:610
+msgid "Accept Party Invite"
+msgstr "Accetta invito nel party"
 
-#: ../src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Colpo critico"
+#: src/gui/socialwindow.cpp:621
+msgid "Cannot create party. You are already in a party"
+msgstr ""
 
-#: ../src/gui/userpalette.cpp:107
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "Il giocatore colpisce il mostro"
+msgid "Party Name"
+msgstr "Party"
 
-#: ../src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
+#: src/gui/socialwindow.cpp:627
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Scegliere il proprio server"
 
-#: ../src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
+msgid "Specials"
 msgstr ""
 
-#: ../src/client.cpp:682
-#, fuzzy
-msgid "Logging in"
-msgstr "Autenticazione"
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
+#, c-format
+msgid "Level: %d"
+msgstr "Livello: %d"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
-msgid "Login"
-msgstr "Autenticazione"
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
+#, c-format
+msgid "Money: %s"
+msgstr "Soldi: %s"
 
-#: ../src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#: src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "HP:"
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr ""
+#: src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Esperienza:"
 
-#: ../src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Fortuna"
+#: src/gui/statuswindow.cpp:130
+msgid "MP:"
+msgstr "MP:"
 
-#: ../src/net/tmwa/generalhandler.cpp:106
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
-msgid "Luck %+d"
-msgstr "Fortuna %+d"
+msgid "Job: %d"
+msgstr "Lavoro: %d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Fortuna:"
+#: src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Lavoro:"
 
-#: ../src/gui/skilldialog.cpp:455
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Livello: %d"
+msgid "Character points: %d"
+msgstr "Statistiche personaggio OK"
 
-#: ../src/gui/skilldialog.cpp:444
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Livello: %d"
-
-#: ../src/net/tmwa/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Attack"
-msgstr "Attacco Magico:"
+msgid "Correction points: %d"
+msgstr "Punti abilità: %d"
 
-#: ../src/net/tmwa/generalhandler.cpp:227
-#, fuzzy
-msgid "M.Defense"
-msgstr "Difesa Magica:"
+#: src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Inizia uno scambio"
 
-#: ../src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
+#: src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Confermato. In attesa..."
 
-#: ../src/resources/itemdb.cpp:56
-#, c-format
-msgid "MP %+d"
-msgstr "PM %+d"
+#: src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Accetta scambio"
 
-#: ../src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "MP:"
+#: src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Accettato. In attesa..."
 
-#: ../src/net/tmwa/chathandler.cpp:190
-#, fuzzy
-msgid "MVP player."
-msgstr "Giocatore"
+#: src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Commercia: Tu"
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
-msgid "Male"
-msgstr "Maschio"
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Commercia"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Mappa"
+#: src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Aggiungi"
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Nome: %s"
+msgid "You get %s"
+msgstr "Hai ottenuto %s"
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Massimo"
+#: src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Dai:"
 
-#: ../src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Medio"
+#: src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Cambia"
 
-#: ../src/gui/socialwindow.cpp:157
-msgid "Member Invite to Guild"
+#: src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
+"finestra."
 
-#: ../src/gui/socialwindow.cpp:236
-#, fuzzy
-msgid "Member Invite to Party"
-msgstr "/party > Invita un utente nel party"
-
-#: ../src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
+#: src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "Non hai abbastanza denaro."
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Messaggio"
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Nome: %s"
 
-#: ../src/commandhandler.cpp:480
-msgid "Message closes chat."
-msgstr "I messaggi chiudono la conversazione."
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Aggiornamento..."
 
-#: ../src/commandhandler.cpp:493
-msgid "Message now closes chat."
-msgstr "I messaggi adesso chiudono la conversazione."
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Connessione..."
 
-#: ../src/keyboardconfig.cpp:75
-msgid "Minimap Window"
-msgstr "Finestra Minimappa"
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Gioca"
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "Mini mappa"
+#: src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1 L'aggiornamento è stato completato."
 
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Perde"
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1 È fortemente raccomandato"
 
-#: ../src/gui/statuswindow.cpp:224
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
-msgid "Money"
-msgstr "Soldi: %d"
+msgid "##1  you try again later."
+msgstr "##1 prova più tardi"
 
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
-#, c-format
-msgid "Money: %s"
-msgstr "Soldi: %s"
+#: src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Completato"
 
-#: ../src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Il mostro colpisce il giocatore"
+#: src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Lista gli utenti nel canale corrente"
 
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Mostri"
+#: src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Setta l'argomento del canale corrente"
 
-#: ../src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Muoviti verso il basso"
+#: src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Abbandona un canale"
 
-#: ../src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Muoviti verso sinistra"
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Trasforma un utente in operatore"
 
-#: ../src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Muoviti verso destra"
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Espelle un utente dal canale"
 
-#: ../src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Muoviti verso l'alto"
+#: src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Comando: /users"
 
-#: ../src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Volume musica"
+#: src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Questo comando mostra gli utenti nel canale."
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
-#, c-format
-msgid "Music: %s"
-msgstr ""
+#: src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Comando: /topic <messaggio>"
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Questo comando imposta l'argomento a <messaggio>"
 
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPCs"
+#: src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Comando: /quit"
 
-#: ../src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Nome"
+#: src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Con questo comando si esce dal canale corrente."
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Nome:"
+#: src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Se sei l'ultima persona nel canale, questo sarà cancellato."
 
-#: ../src/gui/unregisterdialog.cpp:51
-#, c-format
-msgid "Name: %s"
-msgstr "Nome: %s"
+#: src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Comando: /op <nick>"
 
-#: ../src/gui/ministatus.cpp:157
-msgid "Need"
+#: src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Questo comando rende <nick> un operatore del canale"
+
+#: src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
+"Gli operatori possono rendere operatiori o cacciare gli altri utenti dal "
+"canale."
 
-#: ../src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Si deve specificare un utente da rimuovere!"
+#: src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Comando: /kick <nick>"
 
-#: ../src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Questo comando fa uscire <nick> dal canale."
+
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr "Specificare un utente da rendere operatore!"
 
-#: ../src/game.cpp:372
-msgid "Network Error"
-msgstr "Errore di rete"
-
-#: ../src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutrale"
-
-#: ../src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Nuovo indirizzo email errato"
-
-#: ../src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Nuova password errata"
+#: src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Si deve specificare un utente da rimuovere!"
 
-#: ../src/net/tmwa/loginhandler.cpp:92
-#, fuzzy
-msgid "New password too short."
-msgstr "Nuova password troppo corta"
+#: src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Annuncio generale:"
 
-#: ../src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Prossimo"
+#: src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Annuncio generale da %s:"
 
-#: ../src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Scheda Chat Successiva"
+#: src/gui/widgets/chattab.cpp:153
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "%s sospira: "
 
-#: ../src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "No"
+#: src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Non puoi inviare un messaggio vuoto!"
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
+#: src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
+#: src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Nessun gameserver è disponibile."
+#: src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Chiude la scheda del sussurro"
 
-#: ../src/net/tmwa/generalhandler.cpp:132
-#, fuzzy
-msgid "No servers available."
-msgstr "Nessun server disponibile"
+#: src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Comando: /close"
 
-#: ../src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Nessun testo"
+#: src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Questo comando chiude la scheda del sussurro attiva."
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"No, figliolo. Il tuo personaggio non è veramente morto. È... ehm... andato "
-"in un posto migliore."
+#: src/gui/widgets/whispertab.cpp:89
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Comando: /item"
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
-msgid "None"
-msgstr "No"
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
 
-#: ../src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Nessuna registrazione in corso."
+#: src/gui/widgets/whispertab.cpp:96
+#, fuzzy
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Questo comando attiva la registrazione della chat nel file <nome file>"
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
-msgid "Not logged in."
-msgstr ""
+#: src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Stato"
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Niente da vendere."
+#: src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Scorciatoia"
 
-#: ../src/gui/setup_audio.cpp:94
+#: src/gui/worldselectdialog.cpp:71
 #, fuzzy
-msgid "Notice"
-msgstr "Nessun testo"
-
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
-msgid "OK"
-msgstr "OK"
+msgid "Select World"
+msgstr "Seleziona OK"
 
-#: ../src/net/manaserv/loginhandler.cpp:152
+#: src/gui/worldselectdialog.cpp:76
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Vecchio indirizzo email errato"
+msgid "Change Login"
+msgstr "Cambia"
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
+#: src/gui/worldselectdialog.cpp:77
 #, fuzzy
-msgid "Old password incorrect."
-msgstr "Vecchia password non corretta"
-
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr ""
+msgid "Choose World"
+msgstr "Scegliere il proprio server"
 
-#: ../src/net/tmwa/gamehandler.cpp:87
-#, c-format
-msgid "Online users: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Muoviti verso l'alto"
 
-#: ../src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Muoviti verso il basso"
 
-#: ../src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false"
-"\" (falso), \"1\", \"0\"."
+#: src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Muoviti verso sinistra"
 
-#: ../src/main.cpp:43
-msgid "Options:"
-msgstr "Opzioni"
+#: src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Muoviti verso destra"
 
-#: ../src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Il giocatore colpisce il mostro"
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Attacco"
 
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Nomi degli altri giocatori"
+#: src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Mirino e attacco"
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
+#: src/keyboardconfig.cpp:45
+msgid "Smilie"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr ""
+#: src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Parla"
 
-#: ../src/keyboardconfig.cpp:82
-#, fuzzy
-msgid "Outfits Window"
-msgstr "Finestra degli Status"
+#: src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Ferma attacco"
 
-#: ../src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr "Testo sovrastante"
+#: src/keyboardconfig.cpp:48
+#, fuzzy
+msgid "Target Monster"
+msgstr "Punta Più vicino"
 
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Proprio nome"
+#: src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "Punta NPC"
 
-#: ../src/gui/setup_video.cpp:615
-#, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Impostazione effetti particelle modificato."
+#: src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Punta Giocatore"
 
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Effetti particelle"
+#: src/keyboardconfig.cpp:51
+msgid "Pickup"
+msgstr "Raccogli"
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Effetti particelle"
+#: src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Nascondi la Finestra"
 
-#: ../src/gui/setup_video.cpp:263
-#, fuzzy
-msgid "Particle detail"
-msgstr "Dettagli particelle"
+#: src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Siediti"
 
-#: ../src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Dettagli particelle"
+#: src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Screenshot"
 
-#: ../src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Effetti particelle"
+#: src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Abilita/Disabilita Scambi"
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Party"
+#: src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "Trova il percorso sino al mouse"
 
-#: ../src/gui/socialwindow.cpp:222
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
-msgid "Party %s quit requested."
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Party"
+msgid "Item Shortcut %d"
+msgstr "Scorciatoia %d"
 
-#: ../src/gui/socialwindow.cpp:629
-#, fuzzy
-msgid "Party Name"
-msgstr "Party"
+#: src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Finestra di Aiuto"
 
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Manca il nome del party."
+#: src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Finestra degli Status"
 
-#: ../src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Party creato con successo."
+#: src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Finestra dell'Inventario"
 
-#: ../src/gui/beingpopup.cpp:76
-#, fuzzy, c-format
-msgid "Party: %s"
-msgstr "Party (%s)"
+#: src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Finestra dell'Equipaggiamento"
 
-#: ../src/client.cpp:885
-#, fuzzy
-msgid "Password Change"
-msgstr "Password:"
+#: src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Finestra delle Capacità"
 
-#: ../src/client.cpp:886
-msgid "Password changed successfully!"
-msgstr ""
+#: src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Finestra Minimappa"
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Password:"
+#: src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Finestra della Chat"
 
-#: ../src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Le password non corrispondono."
+#: src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Finestra Scorciatoia Oggetti"
 
-#: ../src/gui/popupmenu.cpp:188
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "Raccogli"
+#: src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Finestra del Setup"
 
-#: ../src/keyboardconfig.cpp:52
-msgid "Pickup"
-msgstr "Raccogli"
+#: src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Finestra di debug"
 
-#: ../src/gui/userpalette.cpp:100
+#: src/keyboardconfig.cpp:79
 #, fuzzy
-msgid "Pickup Notification"
-msgstr "Notifica Esperienza"
-
-#: ../src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Gioca"
+msgid "Social Window"
+msgstr "Finestra delle Capacità"
 
-#: ../src/commandhandler.cpp:545
-msgid "Player already ignored!"
+#: src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
 msgstr ""
 
-#: ../src/commandhandler.cpp:554
-#, fuzzy
-msgid "Player could not be ignored!"
-msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
-
-#: ../src/commandhandler.cpp:576
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
-
-#: ../src/net/manaserv/charhandler.cpp:193
+#: src/keyboardconfig.cpp:81
 #, fuzzy
-msgid "Player deleted."
-msgstr "Personaggio cancellato."
+msgid "Outfits Window"
+msgstr "Finestra degli Status"
 
-#: ../src/commandhandler.cpp:574
-msgid "Player no longer ignored!"
+#: src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
 msgstr ""
 
-#: ../src/commandhandler.cpp:552
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "Party creato con successo."
-
-#: ../src/commandhandler.cpp:569
-msgid "Player wasn't ignored!"
+#: src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Giocatori"
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Il giocatore colpisce il mostro"
+#: src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Attiva Chat"
 
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Distribuire %d punti"
+#: src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Scorre la chat in alto"
 
-#: ../src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Rimuovere %d punti"
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Scorre la chat in basso"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
-msgid "Please specify a name."
-msgstr ""
+#: src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "Scheda Chat Precedente"
 
-#: ../src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Per favore inserisci l'indirizzo e la porta del server."
+#: src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Scheda Chat Successiva"
 
-#: ../src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Il veleno non ha avuto effetto..."
+#: src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "Seleziona OK"
 
-#: ../src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Porta:"
+#: src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Ignora input 1"
 
-#: ../src/gui/serverdialog.cpp:452
-msgid "Preparing download"
-msgstr ""
+#: src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Ignora input 2"
 
-#: ../src/gui/chat.cpp:307
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
-msgid "Present: %s; %d players are present."
-msgstr "Sono presenti %d giocatori."
-
-#: ../src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
+"Se non vengono risolti, il gioco potrebbe comportarsi in modo inaspettato."
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Premi il pulsante per cominciare la calibrazione"
-
-#: ../src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "Scheda Chat Precedente"
+#: src/localplayer.cpp:985
+msgid "Unable to pick up item."
+msgstr "Impossibile raccogliere l'oggetto."
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Prezzo: %s / Totale: %s"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:994
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Hai raccolto %s [@@%d|%s@@]."
+msgstr[1] "Hai raccolto %s [@@%d|%s@@]."
 
-#: ../src/playerrelations.cpp:326
-msgid "Print '...'"
+#: src/main.cpp:42
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: ../src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Inizia uno scambio"
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Pulsazione"
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr "Sposta tutti i sussurri in schede"
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Esci"
+#: src/main.cpp:47
+msgid "Options:"
+msgstr "Opzioni"
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Arcobaleno"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version : Mostra la versione"
 
-#: ../src/gui/socialwindow.cpp:556
+#: src/main.cpp:49
 #, fuzzy
-msgid "Received guild request, but one already exists."
-msgstr "Ricevuta richiesta di party, ma ne esiste già una."
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help        : Mostra questo aiuto"
 
-#: ../src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr "Ricevuta richiesta di party, ma ne esiste già una."
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : File di configurazione da utilizzare"
 
-#: ../src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Registrazione..."
+#: src/main.cpp:51
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username : Accedi con questo nome utente"
 
-#: ../src/gui/setup_colors.cpp:108
+#: src/main.cpp:52
 #, fuzzy
-msgid "Red:"
-msgstr "Rosso: "
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password : Accedi con questa password"
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
-msgid "Register"
-msgstr "Registra"
+#: src/main.cpp:53
+#, fuzzy
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character : Accedi con questo personaggio"
 
-#: ../src/gui/login.cpp:129
+#: src/main.cpp:54
 #, fuzzy
-msgid "Registration disabled"
-msgstr "Disabilitata la condivisione degli oggetti"
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server : Nome o IP del server di login"
 
-#: ../src/net/tmwa/loginhandler.cpp:165
+#: src/main.cpp:55
 #, fuzzy
-msgid "Rejected from server."
-msgstr "Respinto dal server"
+msgid "  -p --port           : Login server port"
+msgstr "  -s --server : Nome o IP del server di login"
 
-#: ../src/gui/socialwindow.cpp:472
-#, fuzzy, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Invito rifiutato da %s."
+#: src/main.cpp:56
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : Usa questo host per gli aggiornamenti"
 
-#: ../src/gui/socialwindow.cpp:453
-#, fuzzy, c-format
-msgid "Rejected party invite from %s."
-msgstr "Invito rifiutato da %s."
+#: src/main.cpp:57
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Relazione"
+#: src/main.cpp:59
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Salta i download degli update"
 
-#: ../src/gui/login.cpp:60
+#: src/main.cpp:60
 #, fuzzy
-msgid "Remember username"
-msgstr "Ricorda nome utente"
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data : Diectory dalla quale caricare i dati di gioco"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Richiesta di commercio"
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir : Directory da usare come home directory"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/main.cpp:62
 #, fuzzy
-msgid "Request to quit denied!"
-msgstr "Richiesta di commercio"
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : File di configurazione da utilizzare"
 
-#: ../src/client.cpp:774
+#: src/main.cpp:63
 #, fuzzy
-msgid "Requesting characters"
-msgstr "Scelta Personaggio"
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir : Directory da usare come home directory"
 
-#: ../src/client.cpp:858
-msgid "Requesting registration details"
-msgstr ""
+#: src/main.cpp:65
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl : Disabilita OpenGL per questa sessione"
 
-#: ../src/commandhandler.cpp:436
-#, c-format
-msgid "Requesting to join channel %s."
-msgstr "Richiesta per accedere al canale %s."
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Sei morto."
 
-#: ../src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Reimposta"
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia."
 
-#: ../src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Resetta finestre"
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Non sei più così vivo."
 
-#: ../src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Le fredde mani della morte stanno afferrando la tua anima."
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "Per applicare le modifiche, è necessario riavviare il client."
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Recupera"
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"No, figliolo. Il tuo personaggio non è veramente morto. È... ehm... andato "
+"in un posto migliore."
 
-#: ../src/commandhandler.cpp:489
-msgid "Return now toggles chat."
-msgstr "\"Invio\" adesso attiva/disattiva la conversazione."
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Il tuo piano di spezzare le armi dei tuoi nemici colpendole con la tua gola "
+"ha fallito."
 
-#: ../src/commandhandler.cpp:480
-msgid "Return toggles chat."
-msgstr "Invio attiva/disattiva la conversazione."
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Suppongo non sia andata troppo bene."
 
-#: ../src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Ruota la manopola"
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Tristemente, nessuna traccia di te è stata mai trovata..."
 
-#: ../src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Salvataggio della schermata fallito!"
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Annichilito."
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Risoluzione schermo modificata"
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Screenshot"
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
 
-#: ../src/game.cpp:333
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
-msgid "Screenshot saved as "
-msgstr "Schermata salvata in ~/"
+msgid "You Died"
+msgstr "Sei morto"
 
-#: ../src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Scorre la chat in basso"
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Scorre la chat in alto"
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Sembra tu abbia bisogno di più denaro... ;-)"
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "Seleziona OK"
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Nome utente già esistente"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
 
-#: ../src/gui/worldselectdialog.cpp:71
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
-msgid "Select World"
-msgstr "Seleziona OK"
+msgid "Character's stats are too high."
+msgstr "Statistiche personaggio OK"
 
-#: ../src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Seleziona la quantità di oggetti da lasciare."
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Statistiche personaggio OK"
 
-#: ../src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
-msgstr "Seleziona la quantità di oggetti da ritirare"
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: ../src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Seleziona la quantità di oggetti da dividere."
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Errore sconosciuto"
 
-#: ../src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Selezionare la quantità di oggetti da riporre."
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Informazioni"
 
-#: ../src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Seleziona la quantità di oggetti da scambiare."
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Personaggio cancellato."
 
-#: ../src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Vendi"
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Errore sconosciuto"
 
-#: ../src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Invia"
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Nessun gameserver è disponibile."
 
-#: ../src/gui/serverdialog.cpp:211
-#, fuzzy
-msgid "Server type:"
-msgstr "Server:"
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Server:"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Il giocatore colpisce il mostro"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Impostazioni"
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Comando: /join <canale>"
 
-#: ../src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Finestra del Setup"
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Richiesta per accedere al canale %s."
 
-#: ../src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Volume effetti sonori"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#: ../src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Negozio"
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s si è unito al party."
 
-#: ../src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Scorciatoia"
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
-msgid "Show IP: Off"
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
-msgid "Show IP: On"
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
-msgid "Show damage"
-msgstr "Mostra nomi"
+msgid "Unknown channel event."
+msgstr "Comando sconosciuto."
 
-#: ../src/gui/setup_players.cpp:232
-#, fuzzy
-msgid "Show gender"
-msgstr "Mostra nomi"
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "La gilda è stata creata."
 
-#: ../src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show own name"
-msgstr "Mostra nomi"
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Errore durante la creazione della gilda."
 
-#: ../src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Invito spedito."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "Siediti"
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: ../src/gui/skilldialog.cpp:362
-#, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Abilità"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "La registrazione è già in corso."
 
-#: ../src/gui/skilldialog.cpp:353
-#, fuzzy, c-format
-msgid "Skill Set %d"
-msgstr "Punti abilità: %d"
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Account scaduto"
 
-#: ../src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Finestra delle Capacità"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Nuova password errata"
 
-#: ../src/gui/skilldialog.cpp:271
-#, fuzzy, c-format
-msgid "Skill points available: %d"
-msgstr "Punti abilità: %d"
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Vecchia password non corretta"
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Abilità"
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr "Slot:"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Nuovo indirizzo email errato"
 
-#: ../src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Piccolo"
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Vecchio indirizzo email errato"
 
-#: ../src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "Il nuovo indirizzo e-mail esiste già."
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
-msgid "Social"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:80
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Social Window"
-msgstr "Finestra delle Capacità"
+msgid "Client version is too old."
+msgstr "La varsione del client è troppo vecchia"
 
-#: ../src/gui/setup_video.cpp:582
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Nome utente o password errati"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Account scaduto"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:136
+#: src/net/manaserv/loginhandler.cpp:303
 #, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Qualcun'altro sta cercando di usare questo account"
+msgid "Wrong username, password or email address."
+msgstr "Nome utente, password o indirizzo email errati"
 
-#: ../src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Suono"
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Nome utente già esistente"
 
-#: ../src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Indirizzo email già esistente"
 
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
-msgid "Specials"
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
 msgstr ""
 
-#: ../src/gui/specialswindow.cpp:174
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Gamma"
-
-#: ../src/net/tmwa/generalhandler.cpp:142
-msgid "Speed hack detected."
-msgstr ""
+msgid "%s joined the party."
+msgstr "%s si è unito al party."
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
-msgid "Split"
-msgstr "Dividi"
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s ha rifiutato il tuo invito."
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: ../src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Inizio registrazione..."
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignora la richiesta di commercio."
 
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Statico"
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Richiesta di commercio"
 
-#: ../src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Stato"
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s vuole commerciare con te, accetti?"
 
-#: ../src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Finestra degli Status"
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Commerciando con %s"
 
-#: ../src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Ferma"
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Scambio cancellato."
 
-#: ../src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Ferma attacco"
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Scambio completato."
 
-#: ../src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Ferma registrazione"
+#: src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Espulsione fallita!"
 
-#: ../src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Storage"
+#: src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Kick riuscito!"
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
-msgid "Store"
-msgstr ""
+#: src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Niente da vendere."
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Forza"
+#: src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Grazie per l'acquisto."
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Forza %+d"
+#: src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Impossibile acquistare."
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Forza:"
+#: src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Grazie per la vendita."
 
-#: ../src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Invia"
+#: src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Impossibile vendere."
 
-#: ../src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: ../src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Cambia personaggio"
-
-#: ../src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Cambia server"
+#: src/net/tmwa/charserverhandler.cpp:107
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Impossibile usare questo ID"
 
-#: ../src/gui/setup_video.cpp:445
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Switching to Full Screen"
-msgstr "Modalità a schermo intero"
+msgid "Unknown char-server failure."
+msgstr "Errore sconosciuto"
 
-#: ../src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Parla"
+#: src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+"Creazione del personaggio fallita. E' molto probabile che il nome sia già "
+"stato preso."
 
-#: ../src/gui/popupmenu.cpp:150
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@talk|Parla a %s@@"
+#: src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Personaggio cancellato."
 
-#: ../src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Mirino e attacco"
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Cancellazione del personaggio fallita."
 
-#: ../src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "Target Monster"
-msgstr "Punta Più vicino"
+#: src/net/tmwa/charserverhandler.cpp:266
+msgid "Strength:"
+msgstr "Forza:"
 
-#: ../src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "Punta NPC"
+#: src/net/tmwa/charserverhandler.cpp:267
+msgid "Agility:"
+msgstr "Agilità:"
 
-#: ../src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Punta Giocatore"
+#: src/net/tmwa/charserverhandler.cpp:268
+msgid "Vitality:"
+msgstr "Vitalità:"
 
-#: ../src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Testo"
+#: src/net/tmwa/charserverhandler.cpp:269
+msgid "Intelligence:"
+msgstr "Intelligenza:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Grazie per l'acquisto."
+#: src/net/tmwa/charserverhandler.cpp:270
+msgid "Dexterity:"
+msgstr "Destrezza:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Grazie per la vendita."
+#: src/net/tmwa/charserverhandler.cpp:271
+msgid "Luck:"
+msgstr "Fortuna:"
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Le fredde mani della morte stanno afferrando la tua anima."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Il bisbiglio non può essere inviato, l'utente è offline."
 
-#: ../src/game.cpp:368
-#, fuzzy
-msgid "The connection to the server was lost."
-msgstr "La connessione al server è caduta. Il programma sarà ora chiuso."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
 
-#: ../src/gui/changeemaildialog.cpp:141
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
-msgid "The email address entries mismatch."
-msgstr "Il nuovo indirizzo e-mail esiste già."
+msgid "MVP player."
+msgstr "Giocatore"
 
-#: ../src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "Il nuovo indirizzo e-mail esiste già."
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "I canali non sono supportati!"
 
-#: ../src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "Il nome utente deve contenere almeno %d caratteri."
+#: src/net/tmwa/gamehandler.cpp:88
+#, c-format
+msgid "Online users: %d"
+msgstr ""
 
-#: ../src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "Il nome utente deve avere meno di %d caratteri."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Game"
+msgstr "Nome"
 
-#: ../src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
-msgstr ""
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Richiesta di commercio"
 
-#: ../src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "La password deve essere lunga almeno %d caratteri."
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr "Forza %+d"
 
-#: ../src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "La password deve contenere meno di %d caratteri."
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr "Agilità %+d"
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "La password deve essere lunga almeno %d caratteri."
+msgid "Vitality %+d"
+msgstr "Vitalità %+d"
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "La password deve contenere meno di %d caratteri."
+msgid "Intelligence %+d"
+msgstr "Intelligenza %+d"
 
-#: ../src/gui/register.cpp:166
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "Il nome utente deve contenere almeno %d caratteri."
+msgid "Dexterity %+d"
+msgstr "Destrezza %+d"
 
-#: ../src/gui/register.cpp:174
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "Il nome utente deve avere meno di %d caratteri."
+msgid "Luck %+d"
+msgstr "Fortuna %+d"
 
-#: ../src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
-msgid "This account is already logged in."
-msgstr "Questo accaunt ha già effettuato l'accesso"
+msgid "Authentication failed."
+msgstr "Autenticazione non riuscita"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:81
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Questo comando fa abbandonare il gruppo ad un giocatore."
+msgid "No servers available."
+msgstr "Nessun server disponibile"
 
-#: ../src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Questo comando fa abbandonare il gruppo ad un giocatore."
+#: src/net/tmwa/generalhandler.cpp:139
+#, fuzzy
+msgid "Someone else is trying to use this account."
+msgstr "Qualcun'altro sta cercando di usare questo account"
 
-#: ../src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr ""
+#: src/net/tmwa/generalhandler.cpp:142
+#, fuzzy
+msgid "This account is already logged in."
+msgstr "Questo accaunt ha già effettuato l'accesso"
 
-#: ../src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
+#: src/net/tmwa/generalhandler.cpp:145
+msgid "Speed hack detected."
 msgstr ""
-"Questo comando modifica la politica di condivisione degli oggetti nel gruppo."
 
-#: ../src/commandhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Questo comando imposta l'argomento a <messaggio>"
-
-#: ../src/commandhandler.cpp:229
-msgid "This command clears the chat log of previous chat."
-msgstr "Questo comando pulisce il registro della chat precedente"
-
-#: ../src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "Questo comando chiude la scheda del sussurro attiva."
+msgid "Duplicated login."
+msgstr "Accesso duplicato"
 
-#: ../src/commandhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Questi comandi creano un nuovo gruppo chiamato <nome-gruppo>."
-
-#: ../src/commandhandler.cpp:210
-msgid "This command displays a list of all commands available."
-msgstr "Questo comando mostra una lista di tutti i comandi disponibili."
+msgid "Unknown connection error."
+msgstr "Errore di connessione sconosciuto"
 
-#: ../src/commandhandler.cpp:213
-msgid "This command displays help on <command>."
-msgstr "Questo comando mostra l'aiuto per <comando>."
+#: src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Disconnesso dal server!"
 
-#: ../src/commandhandler.cpp:324
-msgid "This command displays the name of the current map."
-msgstr "Questo comando mostra il nome della mappa attuale."
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Forza"
 
-#: ../src/commandhandler.cpp:329
-msgid "This command displays the number of players currently online."
-msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Agilità"
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr ""
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Vitalità"
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr "Questo comando mostra la corrente politica di condivisione oggetti."
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Intelligenza"
 
-#: ../src/commandhandler.cpp:313
-msgid "This command displays the return toggle status."
-msgstr "Questo comando mostra se il tasto Invio è attivato o meno."
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Destrezza"
 
-#: ../src/commandhandler.cpp:302
-msgid "This command finishes a recording session."
-msgstr "Questo comando termina la sessione di registrazione."
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Fortuna"
 
-#: ../src/commandhandler.cpp:292
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"Questo comando crea una lista dei giocatori che hai attorno e la invia o "
-"alla registrazione della chat se attivata, o alla chat altrimenti."
+#: src/net/tmwa/generalhandler.cpp:238
+#, fuzzy
+msgid "Defense"
+msgstr "Difesa:"
 
-#: ../src/commandhandler.cpp:234
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
+msgid "M.Attack"
+msgstr "Attacco Magico:"
 
-#: ../src/gui/widgets/whispertab.cpp:89
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
+msgid "M.Defense"
+msgstr "Difesa Magica:"
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Questo comando invita <nick> nel tuo party."
+#: src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Accuratezza:"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Questo comando invita <nick> nel tuo party."
+#: src/net/tmwa/generalhandler.cpp:242
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% Evasione:"
 
-#: ../src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Con questo comando si esce dal canale corrente."
+#: src/net/tmwa/generalhandler.cpp:243
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "Colpo critico"
 
-#: ../src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Questo comando rende <nick> un operatore del canale"
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gilda"
 
-#: ../src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Questo comando fa uscire <nick> dal canale."
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Mostra questo messaggio di aiuto"
 
-#: ../src/commandhandler.cpp:240
-msgid "This command makes you enter <channel>."
-msgstr "Questo comando effettua l'accesso al <canale> specificato."
+#: src/net/tmwa/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invita un giocatore al tuo party"
 
-#: ../src/commandhandler.cpp:223
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Questo comando invia un messaggio <msg> a tutti i giocatori in linea."
+#: src/net/tmwa/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Abbandona il party"
 
-#: ../src/commandhandler.cpp:258
-msgid "This command sends the text <message> to <nick>."
-msgstr "Questo comando invia il testo <messaggio> all'utente <nick>."
+#: src/net/tmwa/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Escludi qualcuno dal gruppo in cui ti trovi"
 
-#: ../src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Questo comando imposta l'argomento a <messaggio>"
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
 
-#: ../src/commandhandler.cpp:307
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Questo comando imposta la chiusura del registro della conversazione premendo "
-"il tasto Invio oppure automaticamente."
+#: src/net/tmwa/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Questo comando invita <nick> nel tuo party."
 
-#: ../src/commandhandler.cpp:246
-msgid "This command shows a list of all channels."
-msgstr "Questo comando mostra una lista di tutti i canali."
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Comando: /leave"
 
-#: ../src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Questo comando mostra gli utenti nel canale."
+#: src/net/tmwa/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Questo comando fa abbandonare il gruppo ad un giocatore."
 
-#: ../src/commandhandler.cpp:299
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "Questo comando attiva la registrazione della chat nel file <nome file>"
+#: src/net/tmwa/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Manca il nome del party."
 
-#: ../src/commandhandler.cpp:318
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:95
+#: src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Questo comando attiva la registrazione della chat nel file <nome file>"
+msgid "User is now part of your guild."
+msgstr "%s è ora un membro del tuo party."
 
-#: ../src/commandhandler.cpp:251
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Questo comando mostra agli altri ciò che stai <messaggio>."
+#: src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
+msgstr ""
 
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
+#: src/net/tmwa/guildhandler.cpp:316
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: ../src/commandhandler.cpp:266
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
 msgstr ""
-"Questo comando tenta di creare una scheda per i sussurri tra te e l'utente "
-"<nick>."
 
-#: ../src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "Come appaiono i colori"
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Party"
 
-#: ../src/net/tmwa/loginhandler.cpp:179
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "Questo nome utente è già stato preso"
+#: src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Invita un giocatore al tuo party"
 
-#: ../src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Minuscolo"
+#: src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Abbandona il party"
 
-#: ../src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "A:"
+#: src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Escludi qualcuno dal gruppo in cui ti trovi"
 
-#: ../src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr "Attiva Chat"
+#: src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+"/item > Mostra/modifica le opzioni di condivisione degli oggetti nel gruppo"
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
+#: src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
 msgstr ""
+"/item > Mostra/modifica le opzioni di condivisione dei punti esperienza nel "
+"gruppo"
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Commercia"
+#: src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Questo comando fa abbandonare il gruppo ad un giocatore."
 
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Scambio cancellato."
+#: src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Comando: /item <politica>"
 
-#: ../src/net/tmwa/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
+#: src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
 msgstr ""
+"Questo comando modifica la politica di condivisione degli oggetti nel gruppo."
 
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Scambio completato."
-
-#: ../src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Scambio fallito!"
-
-#: ../src/net/tmwa/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
+#: src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
+"<politica> può essere uno fra \"1\", \"yes\", \"true\" per abilitare la "
+"condivisione degli oggetti o \"0\", \"no\", \"false\" per disabilitarla."
 
-#: ../src/gui/popupmenu.cpp:83
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "Commerciando con %s"
+#: src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Comando: /item"
 
-#: ../src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Commercia: Tu"
+#: src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr "Questo comando mostra la corrente politica di condivisione oggetti."
 
-#: ../src/net/tmwa/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
+#: src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
 msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
+#: src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
+#: src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: ../src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Commerciando con %s"
-
-#: ../src/gui/setup_video.cpp:477
-#, fuzzy
-msgid "Transparency disabled"
-msgstr "Disabilitata la condivisione dell'esperienza."
+#: src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Comando: /exp"
 
-#: ../src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
+#: src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: ../src/localplayer.cpp:1251
-#, fuzzy
-msgid "Tried to pick up nonexistent item."
-msgstr "Impossibile raccogliere l'oggetto."
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Abilitata la condivisione degli oggetti."
 
-#: ../src/commandhandler.cpp:335
-msgid "Type /help for a list of commands."
-msgstr "Digitare /help per una lista dei comandi."
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Disabilitata la condivisione degli oggetti"
 
-#: ../src/gui/changeemaildialog.cpp:51
-#, fuzzy
-msgid "Type new email address twice:"
-msgstr "Inserire il nuovo indirizzo email due volte:"
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "Impossibile condividere gli oggetti."
 
-#: ../src/gui/changepassworddialog.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
-msgid "Type new password twice:"
-msgstr "Inserire la nuova password due volte:"
+msgid "Item sharing unknown."
+msgstr "Abilitata la condivisione degli oggetti."
 
-#: ../src/gui/setup_colors.cpp:71
-#, fuzzy
-msgid "Type:"
-msgstr "Tipo: "
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Abilitata la condivisione dell'esperienza."
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Impossibile acquistare."
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr "Disabilitata la condivisione dell'esperienza."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
-msgid "Unable to equip."
-msgstr "Impossibile equipaggiare."
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "Impossibile condividere l'esperienza."
 
-#: ../src/net/tmwa/network.cpp:345
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Impossibile vendere."
+msgid "Experience sharing unknown."
+msgstr "Abilitata la condivisione dell'esperienza."
 
-#: ../src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Impossibile vendere."
+#: src/net/tmwa/inventoryhandler.cpp:285
+msgid "Failed to use item."
+msgstr ""
 
-#: ../src/net/tmwa/inventoryhandler.cpp:418
-msgid "Unable to unequip."
+#: src/net/tmwa/inventoryhandler.cpp:399
+msgid "Unable to equip."
 msgstr "Impossibile equipaggiare."
 
-#: ../src/gui/setup_keyboard.cpp:90
-#, fuzzy
-msgid "Unassign"
-msgstr "Imposta"
-
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
-msgid "Unequip"
-msgstr "Rimuovi"
-
-#: ../src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "Rimuovi"
-
-#: ../src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr ""
+#: src/net/tmwa/inventoryhandler.cpp:410
+msgid "Unable to unequip."
+msgstr "Impossibile equipaggiare."
 
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr ""
+#: src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Account non trovato. Perfavore riesegui il login."
 
-#: ../src/net/net.cpp:145
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Tipo di oggetto sconosciuto"
+msgid "New password too short."
+msgstr "Nuova password troppo corta"
 
-#: ../src/net/manaserv/chathandler.cpp:327
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
-msgid "Unknown channel event."
-msgstr "Comando sconosciuto."
+msgid "Unregistered ID."
+msgstr "Cancella registrazione"
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Errore sconosciuto"
-
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
-msgid "Unknown command."
-msgstr "Comando sconosciuto."
+msgid "Wrong password."
+msgstr "Password errata"
 
-#: ../src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
-msgid "Unknown connection error."
-msgstr "Errore di connessione sconosciuto"
-
-#: ../src/net/manaserv/charhandler.cpp:208
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Errore sconosciuto"
+msgid "Account expired."
+msgstr "Account scaduto"
 
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
-msgid "Unknown error."
-msgstr "Errore sconosciuto"
+msgid "Rejected from server."
+msgstr "Respinto dal server"
 
-#: ../src/net/tmwa/guildhandler.cpp:315
-msgid "Unknown guild invite response."
+#: src/net/tmwa/loginhandler.cpp:168
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
-msgid "Unknown invite response for %s."
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Oggetto sconosciuto"
-
-#: ../src/localplayer.cpp:1258
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
-msgid "Unknown problem picking up item."
-msgstr "Impossibile raccogliere l'oggetto."
+msgid "This user name is already taken."
+msgstr "Questo nome utente è già stato preso"
 
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Cancella registrazione"
+#: src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#: ../src/client.cpp:926
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
-msgid "Unregister Successful"
-msgstr "Cancella registrazione"
+msgid "Unable to resolve host \""
+msgstr "Impossibile vendere."
 
-#: ../src/net/tmwa/loginhandler.cpp:156
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
-msgid "Unregistered ID."
-msgstr "Cancella registrazione"
+msgid "Connection to server terminated. "
+msgstr "Connessione al server della mappa..."
 
-#: ../src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Su"
+#: src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Non puoi creare un party."
 
-#: ../src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Aggiornamento..."
+#: src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Party creato con successo."
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
-msgid "Use"
-msgstr "Usa"
+#: src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s è già membro di un party."
 
-#: ../src/net/tmwa/guildhandler.cpp:305
-#, fuzzy
-msgid "User is now part of your guild."
+#: src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s ha rifiutato il tuo invito."
+
+#: src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
 msgstr "%s è ora un membro del tuo party."
 
-#: ../src/net/tmwa/guildhandler.cpp:300
-msgid "User rejected guild invite."
+#: src/net/tmwa/partyhandler.cpp:131
+#, c-format
+msgid "Unknown invite response for %s."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Nome utente già esistente"
-
-#: ../src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Video"
-
-#: ../src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Nomi visibili"
-
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Vitalità"
+#: src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Hai lasciato il party."
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
-msgid "Vitality %+d"
-msgstr "Vitalità %+d"
-
-#: ../src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Vitalità:"
-
-#: ../src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "In attesa del server"
-
-#: ../src/gui/serverdialog.cpp:448
-#, fuzzy
-msgid "Waiting for server..."
-msgstr "In attesa del server"
+msgid "%s has left your party."
+msgstr "%s ha lasciato il tuo party."
 
-#: ../src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
+#: src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
-"Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia."
 
-#: ../src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Peso:"
+#: src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s non è nel tuo party!"
 
-#: ../src/gui/itempopup.cpp:126
-#, fuzzy, c-format
-msgid "Weight: %s"
-msgstr "Peso: "
+#: src/net/tmwa/playerhandler.cpp:100
+msgid "Insert coin to continue."
+msgstr "Inserisci un gettone per continuare."
 
-#: ../src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "Quando si ignora:"
+#: src/net/tmwa/playerhandler.cpp:118
+msgid "You're not dead yet. You're just resting."
+msgstr "Non sei morto. Stai riposando."
 
-#: ../src/gui/popupmenu.cpp:91
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "Sussurro"
+#: src/net/tmwa/playerhandler.cpp:119
+msgid "You are no more."
+msgstr "Non sei più."
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
+#: src/net/tmwa/playerhandler.cpp:120
+msgid "You have ceased to be."
+msgstr "Hai smesso di esistere."
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "Il bisbiglio non può essere inviato, l'utente è offline."
+#: src/net/tmwa/playerhandler.cpp:121
+msgid "You've expired and gone to meet your maker."
+msgstr "Sei spirato e sei andato a incontrare il tuo creatore."
 
-#: ../src/gui/chat.cpp:452
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Sussurra a %s: %s"
+#: src/net/tmwa/playerhandler.cpp:122
+msgid "You're a stiff."
+msgstr "Sei cadavere."
 
-#: ../src/gui/socialwindow.cpp:158
-#, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:123
+msgid "Bereft of life, you rest in peace."
+msgstr "Privato della vita, riposi in pace."
 
-#: ../src/gui/socialwindow.cpp:237
-#, c-format
-msgid "Who would you like to invite to party %s?"
+#: src/net/tmwa/playerhandler.cpp:124
+msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Volontà:"
-
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:125
+msgid "Your metabolic processes are now history."
+msgstr "I tuoi processi metabolici sono storia ora."
 
-#: ../src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
+#: src/net/tmwa/playerhandler.cpp:126
+msgid "You're off the twig."
 msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:159
-#, fuzzy
-msgid "Wrong password."
-msgstr "Password errata"
-
-#: ../src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Nome utente o password errati"
-
-#: ../src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Nome utente, password o indirizzo email errati"
-
-#: ../src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Sì"
+#: src/net/tmwa/playerhandler.cpp:127
+msgid "You've kicked the bucket."
+msgstr "Hai tirato le cuoia."
 
-#: ../src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Sei morto"
+#: src/net/tmwa/playerhandler.cpp:128
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Sei un ex-giocatore."
 
-#: ../src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:131
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
+msgid "Message"
+msgstr "Messaggio"
+
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Stai trasportando più della metà del tuo peso. Non puoi recuperare le "
 "energie."
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Sei morto."
-
-#: ../src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Non sei più."
-
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Non sei più così vivo."
-
-#: ../src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: ../src/net/tmwa/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "Non puoi farlo ora!"
-
-#: ../src/net/tmwa/specialhandler.cpp:189
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Non puoi usare questa abilità con questo tipo di arma!"
-
-#: ../src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "Non hai abbastanza denaro."
-
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
-msgid "You get %s"
-msgstr "Hai ottenuto %s"
+msgid "You picked up %s."
+msgstr "Hai raccolto "
 
-#: ../src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "Dai:"
+#: src/net/tmwa/playerhandler.cpp:348
+msgid "Cannot raise skill!"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:592
-#, fuzzy, c-format
-msgid "You have been invited to join the %s party."
-msgstr "%s ti ha invitato ad unirti al party %s."
+#: src/net/tmwa/playerhandler.cpp:488
+msgid "Equip arrows first."
+msgstr "Equipaggia prima le frecce"
 
-#: ../src/gui/socialwindow.cpp:588
-#, fuzzy
-msgid "You have been invited you to join a party."
-msgstr "%s ti ha invitato ad unirti al suo party."
+#: src/net/tmwa/specialhandler.cpp:144
+msgid "Trade failed!"
+msgstr "Scambio fallito!"
 
-#: ../src/net/tmwa/loginhandler.cpp:168
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
+#: src/net/tmwa/specialhandler.cpp:147
+msgid "Emote failed!"
 msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:172
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
+#: src/net/tmwa/specialhandler.cpp:150
+msgid "Sit failed!"
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Hai smesso di esistere."
+#: src/net/tmwa/specialhandler.cpp:153
+msgid "Chat creating failed!"
+msgstr "Creazione della chat fallita!"
 
-#: ../src/net/tmwa/partyhandler.cpp:241
-msgid "You have left the party."
-msgstr "Hai lasciato il party."
+#: src/net/tmwa/specialhandler.cpp:156
+msgid "Could not join party!"
+msgstr "Non puoi unirti al party!"
 
-#: ../src/net/tmwa/specialhandler.cpp:180
-msgid "You have no memos!"
+#: src/net/tmwa/specialhandler.cpp:159
+msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Non hai ancora raggiunto un livello abbastanza alto."
 
-#: ../src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:171
+msgid "Insufficient HP!"
+msgstr "HP insufficienti!"
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
+#: src/net/tmwa/specialhandler.cpp:174
+msgid "Insufficient SP!"
+msgstr "SP insufficienti!"
+
+#: src/net/tmwa/specialhandler.cpp:177
+msgid "You have no memos!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "Hai bisogno di un'altra gemma blu!"
+#: src/net/tmwa/specialhandler.cpp:180
+msgid "You cannot do that right now!"
+msgstr "Non puoi farlo ora!"
+
+#: src/net/tmwa/specialhandler.cpp:183
+msgid "Seems you need more money... ;-)"
+msgstr "Sembra tu abbia bisogno di più denaro... ;-)"
 
-#: ../src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:186
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Non puoi usare questa abilità con questo tipo di arma!"
+
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Hai bisogno di un'altra gemma rossa!"
 
-#: ../src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:192
+msgid "You need another blue gem!"
+msgstr "Hai bisogno di un'altra gemma blu!"
 
-#: ../src/localplayer.cpp:1276
-#, fuzzy, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Hai raccolto %s [@@%d|%s@@]."
-msgstr[1] "Hai raccolto %s [@@%d|%s@@]."
+#: src/net/tmwa/specialhandler.cpp:195
+msgid "You're carrying to much to do this!"
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:344
-#, fuzzy, c-format
-msgid "You picked up %s."
-msgstr "Hai raccolto "
+#: src/net/tmwa/specialhandler.cpp:198
+msgid "Huh? What's that?"
+msgstr "Huh? Cos'è quello?"
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
+#: src/net/tmwa/specialhandler.cpp:207
+msgid "Warp failed..."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
+#: src/net/tmwa/specialhandler.cpp:210
+msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "Sei cadavere."
+#: src/net/tmwa/specialhandler.cpp:213
+msgid "Poison had no effect..."
+msgstr "Il veleno non ha avuto effetto..."
 
-#: ../src/net/tmwa/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
+#: src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "Non sei morto. Stai riposando."
+#: src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
+#: src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
+#: src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "Sei spirato e sei andato a incontrare il tuo creatore."
+#: src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:136
-msgid "You've kicked the bucket."
-msgstr "Hai tirato le cuoia."
+#: src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
+#: src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: ../src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
+#: src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "I tuoi processi metabolici sono storia ora."
+#: src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Il tuo nome deve contenere almeno 4 caratteri."
+#: src/playerrelations.cpp:310
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|Ignora completamente %s@@"
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
-"Il tuo piano di spezzare le armi dei tuoi nemici colpendole con la tua gola "
-"ha fallito."
 
-#: ../src/gui/setup_video.cpp:233
-msgid "as particle"
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "Alto"
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "Attacco %+d"
 
-#: ../src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "in chat"
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "Difesa %+d"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "Basso"
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "PF %+d"
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr ""
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
+msgstr "PM %+d"
 
-#: ../src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "massimo"
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Oggetto sconosciuto"
 
-#: ../src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "medio"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "Spento"
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: ../src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr ""
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: ../src/gui/serverdialog.cpp:558
-#, c-format
-msgid "requires v%s"
-msgstr ""
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Esperienza:"
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
-msgid "unnamed"
-msgstr ""
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Soldi: %d"
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " non può essere creato, perché non esiste! Uscita."
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Lavoro:"
 
-#~ msgid " host: "
-#~ msgstr " host: "
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Livello: %d"
 
-#~ msgid " video mode: "
-#~ msgstr " modalità video: "
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "Accesso negato"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Riflessi:"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Cancellazione del personaggio fallita."
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 della barra degli HP"
+#~ msgid "Willpower:"
+#~ msgstr "Volontà:"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 della barra degli HP"
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Volontà:"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Armi da due mani"
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "Il server è pieno"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 della barra degli HP"
+#~ msgid "Text Shadow"
+#~ msgstr "Ombra del testo"
 
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Espelli giocatore@@"
+#~ msgid "Text Outline"
+#~ msgstr "Contorno del testo"
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Attacca %s@@"
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Etichetta della barra di progresso"
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Cancella@@"
+#~ msgid "Background"
+#~ msgstr "Sfondo"
 
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|Disprezza %s@@"
+#~ msgid "Highlight"
+#~ msgstr "Evidenziazione"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Lascia@@"
+#~ msgid "Tab Highlight"
+#~ msgstr "Evidenziazione scheda"
 
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|Ignora %s@@"
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "L'oggetto è troppo costoso"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Raccogli %s@@"
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "L'oggetto è equipaggiato"
 
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|Raccogli %s@@"
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Lascia@@"
+#~ msgid "Player"
+#~ msgstr "Giocatore"
 
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Scambia Con %s@@"
+#~ msgid "Whisper"
+#~ msgstr "Sussurro"
 
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Non ignorare %s@@"
+#~ msgid "Is"
+#~ msgstr "è"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Equipaggia@@"
+#~ msgid "Server"
+#~ msgstr "Server"
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Togli@@"
+#~ msgid "Hyperlink"
+#~ msgstr "Collegamento ipertestuale"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@usa|Usa@@"
+#~ msgid "Being"
+#~ msgstr "Essere"
 
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Accesso negato"
+#~ msgid "Other Players' Names"
+#~ msgstr "Nomi degli altri giocatori"
 
-#~ msgid "Ammo"
-#~ msgstr "Munizioni"
+#~ msgid "Own Name"
+#~ msgstr "Proprio nome"
 
-#~ msgid "Arms"
-#~ msgstr "Armi"
+#~ msgid "GM Names"
+#~ msgstr "Nomi dei GM"
 
-#~ msgid "Attack:"
-#~ msgstr "Attacco:"
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
 
-#~ msgid "Axe"
-#~ msgstr "Ascia"
+#~ msgid "Monsters"
+#~ msgstr "Mostri"
 
-#~ msgid "Background"
-#~ msgstr "Sfondo"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Tipo di oggetto sconosciuto"
 
-#~ msgid "Bow"
-#~ msgstr "Arco"
+#~ msgid "Generics"
+#~ msgstr "Generici"
 
-#~ msgid "Buddy"
-#~ msgstr "Amico"
+#~ msgid "Hats"
+#~ msgstr "Cappelli"
 
-#~ msgid "Buddy List"
-#~ msgstr "Lista degli amici"
+#~ msgid "Usables"
+#~ msgstr "Utilizzabili"
 
-#~ msgid "Buddys"
-#~ msgstr "Amici"
+#~ msgid "Shirts"
+#~ msgstr "Magliette"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Invoca l'incantesimo Test Spell 1"
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Armi da mano singola"
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Invoca l'incantesimo Test Spell 2"
+#~ msgid "Pants"
+#~ msgstr "Pantaloni"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Invoca l'incantesimo Test Spell 3"
+#~ msgid "Shoes"
+#~ msgstr "Scarpe"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Comando: /new <nome-gruppo>"
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Armi da mano singola"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Connessione al server dell'account..."
+#~ msgid "Shields"
+#~ msgstr "Scudi"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Connessione al server del personaggio..."
+#~ msgid "Rings"
+#~ msgstr "Anelli"
 
-#~ msgid "Cost"
-#~ msgstr "Costo"
+#~ msgid "Necklaces"
+#~ msgstr "Collane"
 
-#~ msgid "Couldn't set "
-#~ msgstr "Impossibile impostare "
+#~ msgid "Arms"
+#~ msgstr "Armi"
 
-#~ msgid "Description: %s"
-#~ msgstr "Descrizione : %s"
+#~ msgid "Ammo"
+#~ msgstr "Munizioni"
 
-#~ msgid "Effect: %s"
-#~ msgstr "Effetto : %s"
+#~ msgid "Particle Effects"
+#~ msgstr "Effetti particelle"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Impossibile passare a modalità "
+#~ msgid "Exp Notification"
+#~ msgstr "Notifica Esperienza"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Il giocatore colpisce il mostro"
 
-#~ msgid "Generics"
-#~ msgstr "Generici"
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Il mostro colpisce il giocatore"
 
-#~ msgid "Guilds"
-#~ msgstr "Gilde"
+#~ msgid "Critical Hit"
+#~ msgstr "Colpo critico"
+
+#~ msgid "Misses"
+#~ msgstr "Perde"
 
 #~ msgid "HP Bar"
 #~ msgstr "Barra HP"
 
-#~ msgid "Hats"
-#~ msgstr "Cappelli"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 della barra degli HP"
 
-#~ msgid "Highlight"
-#~ msgstr "Evidenziazione"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 della barra degli HP"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Collegamento ipertestuale"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 della barra degli HP"
 
-#~ msgid "Is"
-#~ msgstr "è"
+#~ msgid "no"
+#~ msgstr "no"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "L'oggetto è equipaggiato"
+#~ msgid "Buddy"
+#~ msgstr "Amico"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "L'oggetto è troppo costoso"
+#~ msgid "Buddy List"
+#~ msgstr "Lista degli amici"
+
+#~ msgid "Description: %s"
+#~ msgstr "Descrizione : %s"
+
+#~ msgid "Effect: %s"
+#~ msgstr "Effetto : %s"
+
+#~ msgid "Previous"
+#~ msgstr "Precedente"
+
+#~ msgid "New"
+#~ msgstr "Nuovo"
 
 #~ msgid "Job Level: %d"
 #~ msgstr "Livello lavoro: %d"
 
-#~ msgid "Knife"
-#~ msgstr "Coltello"
+#~ msgid "Present: "
+#~ msgstr "Present: "
 
-#~ msgid "Mace"
-#~ msgstr "Mazza"
+#~ msgid "Quit Guild"
+#~ msgstr "Esci dalla Gilda"
 
-#~ msgid "Magic"
-#~ msgstr "Magia"
+#~ msgid "Ok"
+#~ msgstr "Ok"
 
-#~ msgid "Max level"
-#~ msgstr "Livello massimo"
+#~ msgid "Recent:"
+#~ msgstr "Recenti:"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Abilità misteriosa"
+#~ msgid "Magic"
+#~ msgstr "Magia"
 
-#~ msgid "Necklaces"
-#~ msgstr "Collane"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Invoca l'incantesimo Test Spell 1"
 
-#~ msgid "New"
-#~ msgstr "Nuovo"
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Invoca l'incantesimo Test Spell 2"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Invoca l'incantesimo Test Spell 3"
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Armi da mano singola"
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Armi da due mani"
 
-#~ msgid "Pants"
-#~ msgstr "Pantaloni"
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Scambia Con %s@@"
 
-#~ msgid "Party Window"
-#~ msgstr "Finestra del Party"
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Attacca %s@@"
 
-#~ msgid "Player"
-#~ msgstr "Giocatore"
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Disprezza %s@@"
 
-#~ msgid "Polearm"
-#~ msgstr "Asta"
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignora %s@@"
 
-#~ msgid "Present: "
-#~ msgstr "Present: "
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Non ignorare %s@@"
 
-#~ msgid "Previous"
-#~ msgstr "Precedente"
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Espelli giocatore@@"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Etichetta della barra di progresso"
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancella@@"
 
-#~ msgid "Quit Guild"
-#~ msgstr "Esci dalla Gilda"
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Raccogli %s@@"
 
-#~ msgid "Recent:"
-#~ msgstr "Recenti:"
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Togli@@"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Punti Stato rimanenti: %d"
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Equipaggia@@"
 
-#~ msgid "Rings"
-#~ msgstr "Anelli"
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@usa|Usa@@"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Lentezza dello scroll"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Lascia@@"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Raggio dello scroll"
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Lascia@@"
 
 #~ msgid "Select Server"
 #~ msgstr "Selezione server"
 
-#~ msgid "Server"
-#~ msgstr "Server"
+#~ msgid "Failed to switch to "
+#~ msgstr "Impossibile passare a modalità "
 
-#~ msgid "Shields"
-#~ msgstr "Scudi"
+#~ msgid "windowed"
+#~ msgstr "finestra"
 
-#~ msgid "Shirts"
-#~ msgstr "Magliette"
+#~ msgid "fullscreen"
+#~ msgstr "schermo intero"
 
-#~ msgid "Shoes"
-#~ msgstr "Scarpe"
+#~ msgid "Mystery Skill"
+#~ msgstr "Abilità misteriosa"
 
-#~ msgid "Staff"
-#~ msgstr "Staffa"
+#~ msgid "Weapons"
+#~ msgstr "Armi"
 
 #~ msgid "Stats"
 #~ msgstr "Statistiche"
 
-#~ msgid "Sword"
-#~ msgstr "Spada"
+#~ msgid "Total"
+#~ msgstr "Totale"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Evidenziazione scheda"
+#~ msgid "Cost"
+#~ msgstr "Costo"
 
-#~ msgid "Text Outline"
-#~ msgstr "Contorno del testo"
+#~ msgid "Attack:"
+#~ msgstr "Attacco:"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Ombra del testo"
+#~ msgid "% Reflex:"
+#~ msgstr "% Riflessi:"
 
-#~ msgid "Thrown"
-#~ msgstr "Deviato"
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Punti Stato rimanenti: %d"
 
-#~ msgid "Total"
-#~ msgstr "Totale"
+#~ msgid "Max level"
+#~ msgstr "Livello massimo"
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Armi da mano singola"
+#~ msgid "curl error "
+#~ msgstr "errore di curl "
+
+#~ msgid " host: "
+#~ msgstr " host: "
+
+#~ msgid "Guilds"
+#~ msgstr "Gilde"
+
+#~ msgid "Buddys"
+#~ msgstr "Amici"
+
+#~ msgid "Party Window"
+#~ msgstr "Finestra del Party"
 
 #~ msgid "Unarmed"
 #~ msgstr "Disarmato"
 
-#~ msgid "Unknown Skill"
-#~ msgstr "Capacità sconosciuta"
+#~ msgid "Knife"
+#~ msgstr "Coltello"
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Cancellazione del personaggio fallita."
+#~ msgid "Sword"
+#~ msgstr "Spada"
 
-#~ msgid "Usables"
-#~ msgstr "Utilizzabili"
+#~ msgid "Polearm"
+#~ msgstr "Asta"
 
-#~ msgid "Weapons"
-#~ msgstr "Armi"
+#~ msgid "Staff"
+#~ msgstr "Staffa"
 
 #~ msgid "Whip"
 #~ msgstr "Frusta"
 
-#~ msgid "Whisper"
-#~ msgstr "Sussurro"
+#~ msgid "Bow"
+#~ msgstr "Arco"
 
-#~ msgid "Willpower:"
-#~ msgstr "Volontà:"
+#~ msgid "Mace"
+#~ msgstr "Mazza"
 
-#~ msgid "curl error "
-#~ msgstr "errore di curl "
+#~ msgid "Axe"
+#~ msgstr "Ascia"
 
-#~ msgid "fullscreen"
-#~ msgstr "schermo intero"
+#~ msgid "Thrown"
+#~ msgstr "Deviato"
+
+#~ msgid "Unknown Skill"
+#~ msgstr "Capacità sconosciuta"
+
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " non può essere creato, perché non esiste! Uscita."
+
+#~ msgid "Couldn't set "
+#~ msgstr "Impossibile impostare "
+
+#~ msgid " video mode: "
+#~ msgstr " modalità video: "
 
 #~ msgid "mana"
 #~ msgstr "mana"
 
-#~ msgid "no"
-#~ msgstr "no"
+#~ msgid "Connecting to character server..."
+#~ msgstr "Connessione al server del personaggio..."
 
-#~ msgid "windowed"
-#~ msgstr "finestra"
+#~ msgid "Connecting to account server..."
+#~ msgstr "Connessione al server dell'account..."
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Comando: /new <nome-gruppo>"
+
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@pickup|Raccogli %s@@"
+
+#~ msgid "Scroll radius"
+#~ msgstr "Raggio dello scroll"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Lentezza dello scroll"
diff --git a/po/ja.po b/po/ja.po
index 3bc2a0eb..225e733d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-02-28 13:40+0000\n"
 "Last-Translator: swimmy <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -19,294 +19,290 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "マップサー��接続中…"
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "ログイン"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "キャラを�択"
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "マップサー��接続中…"
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "サー�"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "パスワード:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "変更"
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "本メン�ー�無事�昇進�れ�。"
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "登録解除"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "無効�アップデートホスト: "
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "更新フォルダ�作�エラー"
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "�明�コマンド"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-ヘルプ-"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/helpを入力�る��ヘルプメニューを表示���。"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where を入力�る���在�マップ�を表示���。"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who を入力�る��オンライン��るユーザー�数を表示���。"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me を入力�る��自分�関�る情報を教���。"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear を入力�る���ャットウィンドウを�れ�����。"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg を入力�る��他�ユーザー�プライベートメッセージを�信���。"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper �/msg�����。"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w �/msg�����。"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "/query を入力�る��他�ユーザー��プライベート��ャットタブを作����。"
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q �/query�����。"
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list を入力�る�����公共��ャン�ルを表示���。"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 "/join (+�ャン�ル�)を�入力�る��新���ャン�ルを作��る��既��る"
 "�ャン�ル��加���。"
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create�新パーティ作�"
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 "/party (＋ユーザー�)を入力�る����ユーザー�パーティ招待を�り��。"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/recordを入力�る��外部�ファイル��ャットを記録���。"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 "/toggleを入力�る��＜リターン＞��ャットログを留��������を決定��"
 "�。"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/presentを入力�る���在�プレイヤーリストを表示���。(記録���る場�"
 "���ャットログ��信�れ��。)"
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 "/announce を入力�る��グロー�ルアナウンスを�る�������。（ゲームマ"
 "スター��）"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "も��情報を得��場���/help (コマンド）�入力������。"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "コマンド: /help"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "��コマンド�有効�����コマンドを表示���。"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "コマンド: /help ＜コマンド＞"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "��コマンド�入力��コマンド�ヘルプを表示���。"
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "コマンド: /announce ＜メッセージ＞"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** GM��り有効 ***"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "��コマンド���オンライン��る全��プレイヤー�メッセージを�信���。"
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "コマンド: /clear"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "��コマンド���以���ャット�ログを消去���。"
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "コマンド: /item <�リシ>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "��コマンド��在オンライン状態��るプレイヤー�数を表示���。"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "コマンド: /join ＜�ャン�ル＞"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "��コマンド��入力���ャン�ル��加���。"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "も����ャン�ル���場���新��作られ��。"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "コマンド: /list"
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "��コマンド����ャン�ルリストを表示���。"
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "コマンド: /me ＜メッセージ＞"
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "��コマンド���他�人�入力��状態��る��を教���。"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "コマンド: /msg ＜ニック�ーム＞＜メッセージ＞"
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "コマンド: /whisper  ＜ニック�ーム＞ ＜メッセージ＞"
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "コマンド: /w <ニック�ーム> <メッセージ>"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "��コマンド���メッセージを入力��人��信���。"
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
@@ -314,60 +310,41 @@ msgstr ""
 "入力�るニック�ーム�スペース�入���る場��ダブルコーテーション(\")�囲"
 "ん�����。"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "コマンド: /query ＜ニック�ーム＞"
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "コマンド: /q ＜ニック�ーム＞"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "��コマンド���入力��プレイヤー���ャットタブを作����。"
 
-#: src/commandhandler.cpp:270
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "コマンド: /w <ニック�ーム> <メッセージ>"
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-#, fuzzy
-msgid "Command: /away"
-msgstr "コマンド: /who"
-
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "��コマンド���トピックを設定���。"
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "コマンド: /create ＜パーティ�＞"
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "本コマンド���引数����新パーティ作�"
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "コマンド: /party ＜ニック�ーム＞"
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "��コマンド���入力��プレイヤーを自分�パーティー�招待���。"
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "コマンド: /present"
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -375,27 +352,27 @@ msgstr ""
 "��コマンド�見���る範囲内��るプレイヤー�リストを得��記録���る�"
 "ら記録ログ�������れ��ャットログ��られ��。"
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "コマンド: /record ＜ファイル�＞"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "��コマンド���入力��ファイル��ャットログ�記録を開始���。"
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "コマンド: /record"
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "��コマンド���記録セッションを終了����。"
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "コマンド: /toggle <状態>"
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -403,7 +380,7 @@ msgstr ""
 "��コマンド�リターンキー��ャットログを留������も����ャットログ"
 "�自動的�消�る����を設定���。"
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -411,48 +388,48 @@ msgstr ""
 "<状態>�部分�切り替�をオン��る��\"1\",\"yes\",\"true\"��れ�一�を�"
 "オフ��る��\"0\",\"no\",\"false\"��れ���り��。"
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "コマンド: /toggle"
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "��コマンド���トグル�スイッ�状態を表示���。"
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "コマンド: /item <�リシ>"
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "コマンド: /where"
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "��コマンド��在地点�マップ���を表示���。"
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "コマンド: /who"
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "��コマンド��在オンライン状態��るプレイヤー�数を表示���。"
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "/help を入力�る���能�コマンド�リストを表示���。"
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "空�メッセージを�信�る�������ん�"
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -461,67 +438,67 @@ msgstr ""
 "%s�言�メッセージタブ�作������ん��れ�も�既�存在���る��自分"
 "��。"
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "%s����ャン�ル���加を�求�����。"
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "パーティ����。"
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "リターン��ャットを留������。"
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "メッセージ��ャットを閉���。"
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "リターン��れ�ら�ャットを留������。"
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "メッセージ��れ�ら�ャットを閉���。"
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "パーティ作��功"
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "プライベート�メッセージ��れ�����ユーザ�無視�れ�。"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "プライベート�メッセージ��れ�����ユーザ�無視�れ�。"
@@ -533,42 +510,42 @@ msgstr ""
 "/%s���能�オプション�：\"yes\", \"no\", \"true\", \"false\", \"1\", "
 "\"0\"。"
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "~/�スクリーンショットを�存����。"
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを�存�る���失敗�����"
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "サー��切断�れ����プログラム�終了���。"
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "�ットワークエラー"
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "他人�ら�トレードリクエストを無視���。"
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "他人�ら�トレードリクエストを��入れ��。"
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "マップをロード�る�������ん���。"
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sをロード���る間�エラー�起����。"
@@ -582,34 +559,34 @@ msgstr "パーティ (%s)"
 msgid "Buy"
 msgstr "買�"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "価格:%s /�計:%s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "終了"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "最大"
 
@@ -623,11 +600,11 @@ msgstr "売る"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "キャンセル"
@@ -703,14 +680,14 @@ msgstr "キャラクターを作�"
 msgid "Name:"
 msgstr "��:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -727,8 +704,8 @@ msgstr "髪�色："
 msgid "Hair style:"
 msgstr "髪型："
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "作�"
 
@@ -784,8 +761,8 @@ msgstr "登録解除"
 msgid "Change Email"
 msgstr "メールアドレスを変�る。"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "削除"
 
@@ -794,24 +771,24 @@ msgstr "削除"
 msgid "Choose"
 msgstr "閉�る"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "�ャット"
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "オンラインプレイヤー�%d人��。"
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "出席者�記録ログ�書�れ���。"
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%s��信中： %s"
@@ -877,8 +854,8 @@ msgstr "環境FX"
 msgid "Equipment"
 msgstr "装備"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "外�"
 
@@ -886,7 +863,7 @@ msgstr "外�"
 msgid "Help"
 msgstr "ヘルプ"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "閉�る"
 
@@ -898,81 +875,84 @@ msgstr "アイテム"
 msgid "Storage"
 msgstr "倉庫"
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr "スロット"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "装備�る"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "使�"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "���"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "分割�る"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "��"
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr "�存"
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr "�り戻�"
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "���"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "全�"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "交��るアイテム��を�択������。"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "���アイテム��を�択������"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "�管�るアイテム��を�択������。"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "�り出�アイテム��を�択������。"
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "分割�るアイテム��を�択������。"
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "��： "
@@ -1004,40 +984,40 @@ msgstr "アイテムシェア無効"
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "地図"
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "サー�を待�����…"
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "次�"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "決定"
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "リセット"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1052,7 +1032,7 @@ msgstr "宛先:"
 msgid "Send"
 msgstr "�信�る"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "文字�差出人�無効����信�失敗����。"
 
@@ -1142,7 +1122,7 @@ msgstr "@@name|��を�ャット�追加＠＠"
 msgid "Pick up %s"
 msgstr "拾�"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|�ャット�追加@@"
@@ -1215,61 +1195,61 @@ msgstr "パスワード�%d文字より短���������ん。"
 msgid "Passwords do not match."
 msgstr "パスワード�一致�����ん。"
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "サー�ーを�ん�����。"
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "サー�:"
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "�ート:"
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "サー�:"
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "接続�����..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "カスタムカーソル"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "サー��アドレス��ート番�を両方入力������。"
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "サー�を待�����…"
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1307,54 +1287,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "�れ���色���よ��見�る���。"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "色彩"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "種類 "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "�や�"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "点滅"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "カラフル"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "スペクトル"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "�れ： "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "赤色: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "緑色: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "�色: "
@@ -1440,28 +1420,33 @@ msgstr "無視�る"
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "交�を承��る"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "プライベートメッセージを���る��を承��る"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "プライベートメッセージをタブ�出�。"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "��を表示"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "売る����能"
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "プレイヤー"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "無視�際��："
 
@@ -1517,517 +1502,485 @@ msgstr "中"
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "フールスクリーン"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "カスタムカーソル"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "��を表示�る"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "粒�効果"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "��を表示"
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "ピックアップ通知表示"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "�ャット中"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "画�内�"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS�界値:"
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 #, fuzzy
 msgid "Show damage"
 msgstr "��を表示"
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "ヘッダーテキスト"
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "GUI��明"
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "環境FX"
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "粒��詳細"
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "フォントサイズ"
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "���"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "�在�モード�も��モード�復元も��失敗�����"
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "�在�モード�も��モード�復元も��失敗�����"
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "全画��変更"
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "設定変更�����起動を������。"
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "OpenGLを変�る"
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL�設定を変更�る����起動を������。"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 #, fuzzy
 msgid "Transparency disabled"
 msgstr "経験シェア無効"
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "スクリーン�解�度�変�り���。"
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更����アプリケーションを�起動������。"
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "粒��効果�設定�変�り���。"
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "変化�マップ��������ら影響���。"
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "スキル"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "上�る"
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "スキル�イント: %d"
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "スキル�イント: %d"
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "スキル"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "レベル: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "レベル: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "ギルド作��功"
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "ギルドを作��る"
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "本当�終了��もよ������?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr ""
+"/party (＋ユーザー�)を入力�る����ユーザー�パーティ招待を�り��。"
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr ""
 "/party (＋ユーザー�)を入力�る����ユーザー�パーティ招待を�り��。"
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "本当�終了��もよ������?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "ギルドを作��る"
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "キャラクターを作�"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "ユーザーを招待�る"
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "大"
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "%s�ら�招待を��入れ���。"
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "%s�ら�招待を拒�����。"
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%s�ら�招待を��入れ���。"
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%s�ら�招待を拒�����。"
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "ギルド作�エラー"
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "ギルド"
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "サー�ーを�ん�����。"
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "パーティ��招待を���り�����も�既�存在�����。"
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s����を%s���パーティ�招待����。"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "パーティ招待を��入れ��。"
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "パーティ��招待を���り�����も�既�存在�����。"
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s����をパーティ�招待����。"
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s����を%s���パーティ�招待����。"
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s����をパーティ�招待����。"
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s����を%s���パーティ�招待����。"
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "パーティ招待を��入れ��。"
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "パーティー"
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "サー�ーを�ん�����。"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "GP:%s"
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "経験値:"
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "ジョブ: %d"
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "ジョブ�イント:"
 
-#: src/gui/statuswindow.cpp:203
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "経験値:"
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "GP: %d"
-
-#: src/gui/statuswindow.cpp:234
-#, fuzzy
-msgid "Job"
-msgstr "ジョブ�イント:"
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "キャラクター�能力�イント�分���題�り��ん。"
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "スキル�イント: %d"
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "レベル: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "交���案"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "確�����。待�����…。"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "交�を了承�る"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "了承����。待�����…。"
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "交�:����"
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "交�"
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "追加"
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "%sを貰����。"
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "��る物:"
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "変更"
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "アイテムを追加�る���失敗����。アイテム一種類を一��ウインドウ上��"
 "複��追加�る���出���ん�"
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "�金�足��。"
 
@@ -2067,84 +2020,6 @@ msgstr "##1 も�一度や��������。"
 msgid "Completed"
 msgstr "完了"
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "人"
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "他�プレイヤー�"
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "自分���"
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "ゲームマスター�"
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPC��"
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "モンスター"
-
-#: src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "パーティー"
-
-#: src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "ギルド"
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "特有�効果"
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "�集通知"
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "経験値通知"
-
-#: src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "プレイヤー�モンスターをアタック��時"
-
-#: src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "モンスター�プレイヤーをアタック��時"
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "クリティカルヒット"
-
-#: src/gui/userpalette.cpp:107
-#, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "プレイヤー�モンスターをアタック��時"
-
-#: src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "クリティカルヒット"
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "ミス"
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users��在�る�ャン�ル�ユーザ�リストを表示���。"
@@ -2223,56 +2098,56 @@ msgstr "オペレーター��る人�必����"
 msgid "Need a user to kick!"
 msgstr "追�出������るメン�ー�必����"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "アナウンス:"
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s�ら�アナウンス:"
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s�ら�PM: "
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "空��ャットを�る�������ん�"
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close�プライベートメッセージ�タブを閉���。"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "コマンド: /close"
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 "��コマンド����在開���るプライベートメッセージ�タブを閉���。"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "コマンド: /item"
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "��コマンド��在オンライン状態��るプレイヤー�数を表示���。"
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "��コマンド���入力��ファイル��ャットログ�記録を開始���。"
@@ -2300,321 +2175,334 @@ msgstr "変更"
 msgid "Choose World"
 msgstr "サー�ーを�ん�����。"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "上移動"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "下移動"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "左移動"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "�移動"
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "攻撃"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "ターゲット�攻撃"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "スマイリー"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "話�"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "攻撃を止�る"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "一番近�物を狙�"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "NPCを狙�"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "プレイヤーを狙�"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "拾�"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "ウィンドウを隠�"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "座る"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "�引を�能/��能��る"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "マウス����を表示�る"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "アイテムショートカット: %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "ヘルプウィンドウ"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "ステータス・ウィンドウ"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "在庫ウィンドウ"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "装備ウィンドウ"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "スキルウィンドウ"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "���マップウィンドウ"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "�ャットウィンドウ"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "アイテムショートカットウィンドウ"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "設定ウィンドウ"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "デ�グウィンドウ"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "スキルウィンドウ"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "表情ショートカットウィンドウ"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "ステータス・ウィンドウ"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "スマイリーショートカット: %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "トグル�ャット"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "�ャットを上�スクロール�る"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "�ャットを下�スクロール�る"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "���ャットタブ"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "次��ャットタブ"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "OKを�択�る"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "インプット１無視"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "インプット２無視"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "修正���れ��ゲームプレイ�変��る����り��。"
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "アイテムを拾��������。"
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "%s [@@%d|%s@@]を拾��。"
 msgstr[1] "%s [@@%d|%s@@]を拾��。"
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "オプション:"
 
-#: src/main.cpp:44
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : �ーション番�表示"
 
-#: src/main.cpp:45
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help：ヘルプ表示"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file :使用�れ��る設定ファイル"
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username: 本ユーザ��ログイン�る。"
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password :ログイン�対�るパスワード設定"
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character :本キャラ�ログイン�る"
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : ログインサー���る��IPアドレス"
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : ログインサー���ート番�"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host :本ホスト�更新ホスト���使用"
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default: デフォールトキャラクタサー��キャラクタ�択"
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : 更新ダウンロードをスキップ�る。"
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data :本レ�ジトリ�らゲームデータをロード�る。"
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir :ホームレ�ジトリ���使用���るフォルダ"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file :使用�れ��る設定ファイル"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir :ホームレ�ジトリ���使用���るフォルダ"
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : 本セッション�OpenGL�使用��"
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr "����死����。"
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "残念��知ら��������様�キャラ�戦闘中亡����������。"
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr "今�ら生�����。"
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "死神�冷��手�魂��られ�����。"
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr "ゲームオー�ー!"
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2622,92 +2510,93 @@ msgstr ""
 "��ん�棒やや�。����キャラ�本当��ん�����。も��綺麗�����"
 "������。"
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "喉�的�武器を潰�予定����…失敗��。"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr "�ん�り上手��������ー"
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr "��物を確定��欲��？"
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "悲�����り�痕跡���見��ら����。"
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr "全滅�れ�。"
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr "相手�ら自分�頭�渡�れ����。"
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "も�一回倒�れ��水�管�ら死体を這����後�新体を�������"
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 #, fuzzy
 msgid "Press OK to respawn."
 msgstr " OKを押���復活��る。"
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
 msgid "You Died"
 msgstr "死ん�ゃ��。"
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Not logged in."
 msgstr "既�サインイン���。"
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 #, fuzzy
 msgid "Character's name already exists."
 msgstr "ユーザー�ーム�既�存在���る。"
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
 msgid "Character's stats are too high."
 msgstr "キャラクター�能力�イント�分���題�り��ん。"
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 #, fuzzy
 msgid "Character's stats are too low."
 msgstr "キャラクター�能力�イント�分���題�り��ん。"
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2715,96 +2604,96 @@ msgstr ""
 msgid "Unknown error."
 msgstr "�明エラー"
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr "情報"
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 #, fuzzy
 msgid "Player deleted."
 msgstr "キャラクターを削除��。"
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "交��るアイテム��を�択������。"
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "�明エラー"
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr "全サー���在フール��る。"
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr "トピック：%s"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 #, fuzzy
 msgid "Players in this channel:"
 msgstr "プレイヤー�モンスターをアタック��時"
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 #, fuzzy
 msgid "Error joining channel."
 msgstr "コマンド: /join ＜�ャン�ル＞"
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 #, fuzzy
 msgid "Listing channels."
 msgstr "%s����ャン�ル���加を�求�����。"
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, fuzzy, c-format
 msgid "%s entered the channel."
 msgstr "%s�パーティ��加��。"
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "�明�コマンド"
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr "ギルド作��功"
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr "ギルド作�エラー"
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr "招待�信�功"
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr "本メン�ー�無事�昇進�れ�。"
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr "メン�ー昇進失敗"
 
@@ -2895,11 +2784,11 @@ msgstr "メールアド�既�存在���。"
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr "パーティ��加��。"
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr "%s�パーティ��加��。"
@@ -2909,191 +2798,138 @@ msgstr "%s�パーティ��加��。"
 msgid "%s rejected your invite."
 msgstr "%s�招待を拒ん�。"
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "強�"
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "強� %+d"
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "素早�"
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "俊��%+d"
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "器用�"
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr "正確� %+d"
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "活力"
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr "活力 %+d"
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "知能"
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr "知能 %+d"
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "�志力"
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "�志力 %+d"
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr "�引�求を���り中"
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr "�引�求を無視����る。"
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr "�引�求"
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s������引��������応�る？"
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr "%s��引中"
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr "�引中止"
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr "�引完了"
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "キック失敗"
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "キック�功"
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "売り物������ん。"
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "買�����り��り���������。"
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "購買��能"
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "売�����り��り���������。"
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "売る����能"
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "ID使用��"
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "�明エラー"
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "キャラクター作�失敗。本����使�れ��る。"
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "キャラクターを削除��。"
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "キャラ削除失敗"
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "筋力:"
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "素早�:"
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "体力:"
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "知性:"
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "��:"
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "�:"
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 "プライベート�メッセージ��れ�����相手ユーザー�オフライン状態��る。"
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "プライベート�メッセージ��れ�����ユーザ�無視�れ�。"
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "プレイヤー"
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "�ャン�ル�サ�ート�れ����。"
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -3108,80 +2944,125 @@ msgstr "��"
 msgid "Request to quit denied!"
 msgstr "�引�求"
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr "強� %+d"
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr "俊��%+d"
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr "活力 %+d"
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr "知能 %+d"
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr "正確� %+d"
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr "� %+d"
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "�証失敗"
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "�ん�サー��も使用��"
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "他人�本アカウントを使用�����る。"
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "本アカウント�も�オンライン中。"
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "スピード�ック発見"
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "�複ログイン"
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "�明�接続エラー"
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "サー�ー�ら切断�れ�。"
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "強�"
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "素早�"
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "活力"
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "知能"
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "器用�"
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "�"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "防御力:"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "魔法攻撃力:"
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "魔法防御力:"
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "命中率(%):"
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "回�率(%):"
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "クリティカルヒット"
@@ -3232,29 +3113,29 @@ msgstr "本コマンド��パティ�らプレイヤーを追�出��る
 msgid "Guild name is missing."
 msgstr "パーティ����。"
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s�今�らパーティ�メン�ー����。"
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "%s�ら�未知招待返信"
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3334,15 +3215,15 @@ msgstr "コマンド: /exp"
 msgid "This command displays the party's current experience sharing policy."
 msgstr "本コマンド���パーティメン�ー以内�経験分割方�を表示�る。"
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "アイテムシェア有効"
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "アイテムシェア無効"
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "アイテムシェア��能"
 
@@ -3351,15 +3232,15 @@ msgstr "アイテムシェア��能"
 msgid "Item sharing unknown."
 msgstr "アイテムシェア有効"
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "経験シェア有効"
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "経験シェア無効"
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "経験シェア��能"
 
@@ -3368,15 +3249,15 @@ msgstr "経験シェア��能"
 msgid "Experience sharing unknown."
 msgstr "経験シェア有効"
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "アイテム使用失敗"
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "装備��能"
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "装備を外�����能。"
 
@@ -3443,7 +3324,7 @@ msgstr "売る����能"
 msgid "Connection to server terminated. "
 msgstr "マップサー��接続中…"
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "パーティ作�失敗"
 
@@ -3451,245 +3332,239 @@ msgstr "パーティ作�失敗"
 msgid "Party successfully created."
 msgstr "パーティ作��功"
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s�も�パーティ�メン�ー��る。"
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s�招待を拒ん�。"
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s�今�らパーティ�メン�ー����。"
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "%s�ら�未知招待返信"
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "パーティ�ら離れ�。"
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s�パーティ�ら離れ�。"
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "�明�メン�ー�言�����事: %s"
 
 #: src/net/tmwa/partyhandler.cpp:335
-#, fuzzy, c-format
-msgid "Invited user %s to party."
-msgstr ""
-"/party (＋ユーザー�)を入力�る����ユーザー�パーティ招待を�り��。"
-
-#: src/net/tmwa/partyhandler.cpp:340
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s�パーティ������"
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "ゲームを続�る����コインを入れ�����。"
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "��死�����。休憩中����る。"
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "����も�存在�����。"
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "生�る�����������。"
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "�����を引��り����を作��人�逢��行������。"
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "����死体��る。"
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "命を失��天国�����。"
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "も������ん��も生気�満��������ら��死ん�葬られ���ん�ゃ"
 "���？"
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "�����ん�り�今や歴�����ら��。"
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "クタ�ッタ����。"
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "人間界�ら追�出�れ�。"
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "最後�呼����。死神�会��後�無�����ゃ��。"
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "旧プレイヤー��る。"
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "���魂�北極��飛�れ�。"
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "メッセージ"
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "����るアイテム�体�より�分以上����体力�回復����。"
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "を拾��。 "
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "矢を先�装備������。"
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "�引失敗"
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "スマイリー表示失敗"
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "触る���失敗��。"
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "�ャット作�失敗"
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "パーティ��加�������"
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "�����"
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "�����分�高�レベル��������よ�"
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "HP�足�"
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "SP�足�"
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "メモ���"
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "今��行動�無�。"
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "金欠���ん�ゃ���…"
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "本スキル���武器�使���。"
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "他�赤�石�必������"
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "他���石�必������"
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "アイテム�������る状態�"
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "�ん？何�れ？"
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "ワープ�失敗��。"
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "何も盗�����…"
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "毒��効果"
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "�引���能。�引�相手����る。"
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "�引���能。本キャラ�存在�����。"
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "�明��由��引�中止�れ�。"
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "����%s���引"
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "%s���引�中止�れ�。"
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "�������引キャンセルパケット"
 
@@ -3705,53 +3580,44 @@ msgstr "アイテム追加失敗。相手�空���るスロット���
 msgid "Failed adding item for unknown reason."
 msgstr "�明��由�アイテム追加失敗"
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 #, fuzzy
 msgid "Completely ignore"
 msgstr "@@Ignore|%sを完璧�無視�る@@"
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr "攻撃力 %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr "守備力 %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr "�明�アイテム"
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr "����"
 
@@ -3802,6 +3668,24 @@ msgstr "����"
 #~ msgid "Hyperlink"
 #~ msgstr "�イパーリンク"
 
+#~ msgid "Being"
+#~ msgstr "人"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "他�プレイヤー�"
+
+#~ msgid "Own Name"
+#~ msgstr "自分���"
+
+#~ msgid "GM Names"
+#~ msgstr "ゲームマスター�"
+
+#~ msgid "NPCs"
+#~ msgstr "NPC��"
+
+#~ msgid "Monsters"
+#~ msgstr "モンスター"
+
 #~ msgid "Unknown Item Type"
 #~ msgstr "�明�アイテムタイプ"
 
@@ -3846,6 +3730,29 @@ msgstr "����"
 #~ msgid "Ammo"
 #~ msgstr "矢�弾薬��"
 
+#~ msgid "Particle Effects"
+#~ msgstr "特有�効果"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "�集通知"
+
+#~ msgid "Exp Notification"
+#~ msgstr "経験値通知"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "プレイヤー�モンスターをアタック��時"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "モンスター�プレイヤーをアタック��時"
+
+#~ msgid "Critical Hit"
+#~ msgstr "クリティカルヒット"
+
+#~ msgid "Misses"
+#~ msgstr "ミス"
+
 #~ msgid "HP Bar"
 #~ msgstr "HP�ー"
 
@@ -3859,6 +3766,30 @@ msgstr "����"
 #~ msgstr "HP�1/4���"
 
 #, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
+
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
+
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "経験値:"
+
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "GP: %d"
+
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "ジョブ�イント:"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "レベル: %d"
+
+#, fuzzy
 #~ msgid "Access denied."
 #~ msgstr "アクセス拒�"
 
@@ -3872,6 +3803,13 @@ msgstr "����"
 #~ msgid "Willpower:"
 #~ msgstr "�志力"
 
+#~ msgid "Willpower %+d"
+#~ msgstr "�志力 %+d"
+
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "�志力"
+
 #, fuzzy
 #~ msgid "Server is full."
 #~ msgstr "サー�ー�満席��る。"
diff --git a/po/ka.po b/po/ka.po
index 607fbdaa..d110abc3 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-23 22:14+0000\n"
 "Last-Translator: Mpa4Hu <ymen9@pisem.net>\n"
 "Language-Team: Georgian <ka@li.org>\n"
@@ -19,470 +19,449 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "უცნ�ბი კ�მ�ნდ�."
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- დ�ხმ�რებ� --"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > დ�ხმ�რების გ�მ�ტ�ნ�"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > რუქის ს�ხელის გ�მ�ტ�ნ�"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > �ნლ�ინ მ�მხმ�რებლების რ��დენ�ბ�"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > მ�ყევით რ�მე თქვენს შეს�ხებ"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > ფ�ნჯრის გ�სუფთ�ვებ�"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > პრივ�ტული მესიჯის გ�გზ�ვნ� მ�მხმ�რებლისთვის"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "�მ კ�მ�ნდ�ს გ�მ��ქ კ�ნკრეტული რუქის ს�ხელი"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "�მ კ�მ�ნდ�ს გ�მ��ქ კ�ნკრეტული რუქის ს�ხელი"
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "�მ კ�მ�ნდ�ს გ�მ��ქ კ�ნკრეტული რუქის ს�ხელი"
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -491,39 +470,39 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -537,34 +516,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -578,11 +557,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -655,14 +634,14 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -677,8 +656,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -733,8 +712,8 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
@@ -742,24 +721,24 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -825,8 +804,8 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
@@ -834,7 +813,7 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
@@ -846,80 +825,83 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -948,40 +930,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -995,7 +977,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1081,7 +1063,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1153,56 +1135,56 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1239,50 +1221,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1366,27 +1348,31 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1442,484 +1428,457 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-msgid "Level"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1958,78 +1917,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2106,54 +1993,54 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "�მ კ�მ�ნდ�ს გ�მ��ქ კ�ნკრეტული რუქის ს�ხელი"
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2177,389 +2064,402 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/help > დ�ხმ�რების გ�მ�ტ�ნ�"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2567,91 +2467,91 @@ msgstr ""
 msgid "Unknown error."
 msgstr "უცნ�ბი კ�მ�ნდ�."
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "უცნ�ბი კ�მ�ნდ�."
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "უცნ�ბი კ�მ�ნდ�."
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2728,11 +2628,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2742,187 +2642,135 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "უცნ�ბი კ�მ�ნდ�."
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2935,70 +2783,115 @@ msgstr ""
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3044,27 +2937,27 @@ msgstr "�მ კ�მ�ნდ�ს გ�მ��ქ კ�ნკრეტ
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3140,15 +3033,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3156,15 +3049,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3172,15 +3065,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3236,7 +3129,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3244,242 +3137,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3495,51 +3383,42 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
diff --git a/po/mana.pot b/po/mana.pot
index de0daed4..d380b9fb 100644
--- a/po/mana.pot
+++ b/po/mana.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) YEAR The Mana Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\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,3571 +18,3399 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: ../src/client.cpp:655
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: ../src/client.cpp:682
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: ../src/client.cpp:715
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: ../src/client.cpp:774
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: ../src/client.cpp:803
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: ../src/client.cpp:813
+#: src/client.cpp:843
 msgid "Changing game servers"
 msgstr ""
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr ""
 
-#: ../src/client.cpp:858
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: ../src/client.cpp:885
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: ../src/client.cpp:886
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: ../src/client.cpp:905
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: ../src/client.cpp:906
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: ../src/client.cpp:926
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: ../src/client.cpp:927
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: ../src/client.cpp:1244
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/commandhandler.cpp:166
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/commandhandler.cpp:167
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: ../src/commandhandler.cpp:169
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: ../src/commandhandler.cpp:170
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: ../src/commandhandler.cpp:171
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: ../src/commandhandler.cpp:173
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: ../src/commandhandler.cpp:175
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: ../src/commandhandler.cpp:176
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: ../src/commandhandler.cpp:177
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: ../src/commandhandler.cpp:178
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: ../src/commandhandler.cpp:180
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: ../src/commandhandler.cpp:185
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: ../src/commandhandler.cpp:186
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: ../src/commandhandler.cpp:188
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: ../src/commandhandler.cpp:189
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: ../src/commandhandler.cpp:191
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: ../src/commandhandler.cpp:192
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: ../src/commandhandler.cpp:194
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: ../src/commandhandler.cpp:196
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: ../src/commandhandler.cpp:198
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: ../src/commandhandler.cpp:201
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: ../src/commandhandler.cpp:205
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: ../src/commandhandler.cpp:209
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/commandhandler.cpp:210
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/commandhandler.cpp:212
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:213
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/commandhandler.cpp:221
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:222
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/commandhandler.cpp:223
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/commandhandler.cpp:228
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/commandhandler.cpp:229
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/commandhandler.cpp:233
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:234
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: ../src/commandhandler.cpp:239
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:240
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: ../src/commandhandler.cpp:241
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: ../src/commandhandler.cpp:245
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: ../src/commandhandler.cpp:246
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: ../src/commandhandler.cpp:250
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:251
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: ../src/commandhandler.cpp:255
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:256
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:257
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:258
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/commandhandler.cpp:264
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:265
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:266
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: ../src/commandhandler.cpp:271
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: ../src/commandhandler.cpp:274
-msgid "Command: /away"
-msgstr ""
-
-#: ../src/commandhandler.cpp:275
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: ../src/commandhandler.cpp:279
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:280
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: ../src/commandhandler.cpp:284
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: ../src/commandhandler.cpp:291
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/commandhandler.cpp:292
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/commandhandler.cpp:298
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:299
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: ../src/commandhandler.cpp:301
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: ../src/commandhandler.cpp:302
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: ../src/commandhandler.cpp:306
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:307
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/commandhandler.cpp:312
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/commandhandler.cpp:313
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: ../src/commandhandler.cpp:318
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: ../src/commandhandler.cpp:323
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/commandhandler.cpp:324
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/commandhandler.cpp:328
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/commandhandler.cpp:329
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/commandhandler.cpp:335
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/commandhandler.cpp:401
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
-msgstr ""
-
-#: ../src/commandhandler.cpp:422
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: ../src/commandhandler.cpp:436
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: ../src/commandhandler.cpp:480
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/commandhandler.cpp:480
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/commandhandler.cpp:489
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/commandhandler.cpp:493
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: ../src/commandhandler.cpp:545
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: ../src/commandhandler.cpp:552
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: ../src/commandhandler.cpp:554
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: ../src/commandhandler.cpp:569
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: ../src/commandhandler.cpp:574
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: ../src/commandhandler.cpp:576
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: ../src/commandhandler.h:31
+#: src/commandhandler.h:31
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: ../src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: ../src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: ../src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:950
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: ../src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: ../src/gui/beingpopup.cpp:76
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr ""
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:38
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: ../src/gui/changeemaildialog.cpp:51
+#: src/gui/changeemaildialog.cpp:51
 msgid "Type new email address twice:"
 msgstr ""
 
-#: ../src/gui/changeemaildialog.cpp:127
+#: src/gui/changeemaildialog.cpp:127
 #, c-format
 msgid "The new email address needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/changeemaildialog.cpp:134
+#: src/gui/changeemaildialog.cpp:134
 #, c-format
 msgid "The new email address needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/changeemaildialog.cpp:141
+#: src/gui/changeemaildialog.cpp:141
 msgid "The email address entries mismatch."
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:63
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:110
 msgid "Enter the old password first."
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:116
+#: src/gui/changepassworddialog.cpp:116
 #, c-format
 msgid "The new password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:123
+#: src/gui/changepassworddialog.cpp:123
 #, c-format
 msgid "The new password needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:130
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
 msgid "<"
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:74
 msgid "Hair color:"
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:77
+#: src/gui/charcreatedialog.cpp:77
 msgid "Hair style:"
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:127
 msgid "Switch Login"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:150
+#: src/gui/charselectdialog.cpp:150
 msgid "Change Email"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:380
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: ../src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: ../src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
 msgid "Yes"
 msgstr ""
 
-#: ../src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
 msgid "No"
 msgstr ""
 
-#: ../src/gui/debugwindow.cpp:43
+#: src/gui/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
-#: ../src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:56
 #, c-format
 msgid "%d FPS (OpenGL)"
 msgstr ""
 
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
 #, c-format
 msgid "Music: %s"
 msgstr ""
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
 #, c-format
 msgid "Map: %s"
 msgstr ""
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
 #, c-format
 msgid "Minimap: %s"
 msgstr ""
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
 #, c-format
 msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: ../src/gui/debugwindow.cpp:116
+#: src/gui/debugwindow.cpp:116
 #, c-format
 msgid "Particle detail: %s"
 msgstr ""
 
-#: ../src/gui/debugwindow.cpp:121
+#: src/gui/debugwindow.cpp:121
 #, c-format
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr ""
 
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/help.cpp:37
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:59
+#: src/gui/inventorywindow.cpp:59
 msgid "Storage"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: ../src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: ../src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: ../src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: ../src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: ../src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: ../src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:60
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr ""
 
-#: ../src/gui/login.cpp:62
+#: src/gui/login.cpp:62
 msgid "Change Server"
 msgstr ""
 
-#: ../src/gui/login.cpp:129
+#: src/gui/login.cpp:129
 msgid "Registration disabled"
 msgstr ""
 
-#: ../src/gui/login.cpp:129
+#: src/gui/login.cpp:129
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: ../src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: ../src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: ../src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: ../src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: ../src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: ../src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
-#: ../src/gui/npcdialog.cpp:183
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
 msgstr ""
 
-#: ../src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: ../src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: ../src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: ../src/gui/outfitwindow.cpp:70
+#: src/gui/outfitwindow.cpp:70
 msgid "Unequip first"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:83
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:108
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:117
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:130
 #, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:141
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: ../src/gui/quitdialog.cpp:44
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
 
-#: ../src/gui/quitdialog.cpp:45
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr ""
 
-#: ../src/gui/recorder.cpp:87
+#: src/gui/recorder.cpp:87
 msgid "Finishing recording."
 msgstr ""
 
-#: ../src/gui/recorder.cpp:91
+#: src/gui/recorder.cpp:91
 msgid "Not currently recording."
 msgstr ""
 
-#: ../src/gui/recorder.cpp:96
+#: src/gui/recorder.cpp:96
 msgid "Already recording."
 msgstr ""
 
-#: ../src/gui/recorder.cpp:104
+#: src/gui/recorder.cpp:104
 msgid "Starting to record..."
 msgstr ""
 
-#: ../src/gui/recorder.cpp:112
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: ../src/gui/recorder.h:38
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: ../src/gui/recorder.h:39
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:69
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:100
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr ""
 
-#: ../src/gui/register.cpp:166
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:174
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:197
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:42
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:43
 msgid "Download music"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:94
 msgid "Notice"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:94
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:106
 msgid "Sound Engine"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
-#: ../src/gui/setup.cpp:51
+#: src/gui/setup.cpp:51
 msgid "Apply"
 msgstr ""
 
-#: ../src/gui/setup.cpp:51
+#: src/gui/setup.cpp:51
 msgid "Reset Windows"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
 msgid "Calibrate"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:41
 msgid "Joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:83
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:84
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:77
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:86
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:90
 msgid "Unassign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:125
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:67
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:134
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:135
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:137
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:163
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:178
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:231
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:233
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 msgid "None"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: ../src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: ../src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: ../src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: ../src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: ../src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: ../src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: ../src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: ../src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: ../src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: ../src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: ../src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: ../src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: ../src/gui/statuswindow.cpp:224
-msgid "Money"
-msgstr ""
-
-#: ../src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: ../src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: ../src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: ../src/gui/statuswindow.cpp:257
-msgid "Level"
-msgstr ""
-
-#: ../src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: ../src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: ../src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: ../src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: ../src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
-#: ../src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:51
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:142
 msgid "Connecting..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:417
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:419
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:421
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:515
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
-#: ../src/gui/widgets/channeltab.cpp:49
+#: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:50
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:51
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:63
 msgid "Command: /users"
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:64
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:68
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:69
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:73
 msgid "Command: /quit"
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:74
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:75
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: ../src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: ../src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: ../src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: ../src/gui/windowmenu.cpp:54
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr ""
 
-#: ../src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
-#: ../src/gui/worldselectdialog.cpp:71
+#: src/gui/worldselectdialog.cpp:71
 msgid "Select World"
 msgstr ""
 
-#: ../src/gui/worldselectdialog.cpp:76
+#: src/gui/worldselectdialog.cpp:76
 msgid "Change Login"
 msgstr ""
 
-#: ../src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:77
 msgid "Choose World"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: ../src/localplayer.cpp:1251
-msgid "Tried to pick up nonexistent item."
-msgstr ""
-
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
-msgstr ""
-
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
-msgstr ""
-
-#: ../src/localplayer.cpp:1254
-msgid "Inventory is full."
+#: src/localplayer.cpp:985
+msgid "Unable to pick up item."
 msgstr ""
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
-msgstr ""
-
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
-msgstr ""
-
-#: ../src/localplayer.cpp:1258
-msgid "Unknown problem picking up item."
-msgstr ""
-
-#: ../src/localplayer.cpp:1276
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
+#: src/main.cpp:42
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
 msgstr ""
 
-#: ../src/main.cpp:43
+#: src/main.cpp:47
 msgid "Options:"
 msgstr ""
 
-#: ../src/main.cpp:44
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:45
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: ../src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: ../src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: ../src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: ../src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: ../src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: ../src/main.cpp:58
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: ../src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
 msgid "Unknown error."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 msgid "Unknown channel event."
 msgstr ""
 
-#: ../src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: ../src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: ../src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: ../src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: ../src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:87
 msgid "Wrong magic_token."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 msgid "Already logged in."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:93
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Account banned."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:118
 msgid "New password incorrect."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
 msgid "Old password incorrect."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "New email address incorrect."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:152
 msgid "Old email address incorrect."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:158
 msgid "The new email address already exists."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:239
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 msgid "Client version is too old."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:266
 msgid "Wrong username or password."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:272
+#: src/net/manaserv/loginhandler.cpp:272
 msgid "Account banned"
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:275
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:303
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:306
 msgid "Username already exists."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:309
 msgid "Email address already exists."
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:312
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: ../src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: ../src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: ../src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:123
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: ../src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr ""
-
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: ../src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: ../src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: ../src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: ../src/net/net.cpp:145
-msgid "Unknown Server Type! Exiting."
-msgstr ""
-
-#: ../src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: ../src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: ../src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: ../src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: ../src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Game"
 msgstr ""
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:106
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: ../src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: ../src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: ../src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: ../src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: ../src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: ../src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: ../src/net/tmwa/inventoryhandler.cpp:418
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:86
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:92
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:156
+#: src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:159
+#: src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:162
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:168
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:179
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: ../src/net/tmwa/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: ../src/net/tmwa/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: ../src/net/tmwa/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:335
-#, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: ../src/net/tmwa/partyhandler.cpp:340
+#: src/net/tmwa/partyhandler.cpp:335
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: ../src/net/tmwa/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: ../src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: ../src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: ../src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 345a9adc..b6132533 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-09-02 17:55+0000\n"
 "Last-Translator: Øyvind Øritsland <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
@@ -19,279 +19,275 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Venter på server"
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Feil"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Passord:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Avregistrer"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Ukjent kommando"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Hjelp --"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/hjelp > Hvis denne hjelpen"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Viser kartnavn"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Viser antall påloggede brukere"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Si noe om deg selv"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Tømmer vinduet"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Send en privat melding til en bruker"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alternativ for msg"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Alternativ for msg"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "/query > Åpner en fane for å sende private meldinger med en annen bruker"
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Alternativ for query"
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Viser alle offentlige kanaler"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/delta > Delta i eller opprett en kanal"
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/party > Inviter en bruker til en gruppe"
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Inviter en bruker til en gruppe"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/innspilling > Start innspilling av chat til en ekstern fil"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "For mer informasjon, skriv /help <kommando>"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Denne kommandoen viser en liste med alle tilgjengelige kommandoer."
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <msg>"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** kun tilgjengelig for GM ***"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Denne kommandoen sender meldingen <msg> til alle påloggede spillere."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Denne kommandoen klarer chatte-loggen."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Kommando: /join <kanal>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Denne kommandoen viser antall påloggede spillere -"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Kommando: /join <kanal>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Denne kommandoen åpner <kanal>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "<kanal> blir opprettet om den ikke eksisterer."
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Kommando: /list"
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Denne kommandoen viser en liste med alle kanaler."
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Kommando: /me <melding>"
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Denne kommandoen forteller andre at du er (eller gjør) <melding>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Kommando: /msg <brukernavn> <melding>"
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Kommando: /whisper <brukernavn> <melding>"
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Kommando: /w <brukernavn> <melding>"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Denne kommandoen sender teksten <melding> til <brukernavn>."
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
@@ -299,206 +295,187 @@ msgstr ""
 "Hvis <brukernavn> inneholder mellomrom, skriv det mellom to anførselstegn "
 "(\")."
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Kommando: /query <brukernavn>"
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Kommando: /q <brukernavn>"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Denne kommandoen prøver å opprette en fane for private meldinger mellom deg "
 "og <brukernavn>."
 
-#: src/commandhandler.cpp:270
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Kommando: /w <brukernavn> <melding>"
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-#, fuzzy
-msgid "Command: /away"
-msgstr "Kommando: /clear"
-
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Denne kommandoen klarer chatte-loggen."
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Kommando: /party <brukernavn>"
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Denne kommandoen åpner <kanal>"
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Kommando: /party <brukernavn>"
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Denne kommandoen inviterer <brukernavn> til en gruppe med deg."
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Kommando: /present"
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Kommando: /record <filnavn>"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "Denne kommandoen starter opptak av chatte-loggen til filen <filnavn>."
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Kommando: /record"
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Kommando: /announce <msg>"
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Denne kommandoen viser antall påloggede spillere -"
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help for en liste over kommandoer."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Kan ikke sende tomme meldinger!"
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -507,42 +484,42 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr "Generelt"
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Skjermbilde lagret til ~/"
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Lagring av skjermbilde feilet!"
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Forbindelsen til serveren mistet, programmet vil nå avsluttes"
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Kunne ikke laste inn kart."
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Feil i lastingen av %s"
@@ -556,34 +533,34 @@ msgstr "Gruppe (%s)"
 msgid "Buy"
 msgstr "Kjøp"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Maks"
 
@@ -597,11 +574,11 @@ msgstr "Selg"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Avbryt"
@@ -676,14 +653,14 @@ msgstr "Lag karakter:"
 msgid "Name:"
 msgstr "Navn:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -700,8 +677,8 @@ msgstr "HÃ¥rfarge:"
 msgid "Hair style:"
 msgstr "Frisyre:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Lag"
 
@@ -757,8 +734,8 @@ msgstr "Avregistrer"
 msgid "Change Email"
 msgstr "Endre epost-adresse"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Slett"
 
@@ -767,24 +744,24 @@ msgstr "Slett"
 msgid "Choose"
 msgstr "Lukk"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -850,8 +827,8 @@ msgstr ""
 msgid "Equipment"
 msgstr "Utstyr"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
@@ -859,7 +836,7 @@ msgstr ""
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Lukk"
 
@@ -871,80 +848,83 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Bruk"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Del opp"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Vekt:"
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Alt"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Vekt:"
@@ -975,40 +955,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Kart"
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Venter på server"
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Neste"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Bekreft"
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Tilbakestill"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1023,7 +1003,7 @@ msgstr "Til:"
 msgid "Send"
 msgstr "Send"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1110,7 +1090,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1182,61 +1162,61 @@ msgstr "Passordet må være mindre enn %d bokstaver."
 msgid "Passwords do not match."
 msgstr "Passordene stemmer ikke."
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Velg server"
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Kobler til..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Server"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Vennligst skriv inn både adresse og port til en server."
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Venter på server"
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1274,53 +1254,53 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Slik ser fargen ut"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Farger"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Statisk"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Regnbue"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Forsinkelse: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Rød: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Grønn: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Blå: "
@@ -1406,28 +1386,32 @@ msgstr "Ignorert"
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Tillat handel"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Vis navn"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Spillere"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1483,508 +1467,476 @@ msgstr "medium"
 msgid "max"
 msgstr "maks"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Fullskjerm"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Synlige navn"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Partikkeleffekter"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Vis navn"
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "som partikkel"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS-grense:"
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 #, fuzzy
 msgid "Show damage"
 msgstr "Vis navn"
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "GUI-gjennomsiktighet"
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Partikkeldetalje"
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Nei"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Bytter til fullskjerm"
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Bytter OpenGL"
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Endringer av OpenGL krever restart."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Skjermresolusjon endret"
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Partikkeleffekt-instillinger endret."
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Ferdigheter"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Opp"
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Ferdighetspoeng: %d"
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Ferdighetspoeng: %d"
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Ferdigheter"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nivå: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Er du sikker på at du vil avslutte?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > Inviter en bruker til en gruppe"
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Inviter en bruker til en gruppe"
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Er du sikker på at du vil avslutte?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Lag karakter:"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Inviter Bruker"
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Stor"
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Godta invitasjon fra %s."
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Avslo invitasjon fra %s."
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Godta invitasjon fra %s."
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Avslo invitasjon fra %s."
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "GM Navn"
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Velg server"
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Godta Gruppeinvitasjon"
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Godta Gruppeinvitasjon"
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Velg server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Penger: %s"
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "Penger: %d"
-
-#: src/gui/statuswindow.cpp:234
-#, fuzzy
-msgid "Job"
-msgstr "Jobb: %d"
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Ferdighetspoeng: %d"
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Ferdighetspoeng: %d"
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Nivå: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2023,81 +1975,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Andre Spilleres Navn"
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Eget Navn"
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "GM Navn"
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPCer"
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Monstre"
-
-#: src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Gruppe"
-
-#: src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "GM Navn"
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Partikkeleffekter"
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Andre Spilleres Navn"
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2174,55 +2051,55 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Kommando: /record"
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Denne kommandoen viser antall påloggede spillere -"
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Denne kommandoen starter opptak av chatte-loggen til filen <filnavn>."
@@ -2249,390 +2126,403 @@ msgstr ""
 msgid "Choose World"
 msgstr "Velg server"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Monstre"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/hjelp > Hvis denne hjelpen"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2640,92 +2530,92 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Ukjent kommando"
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Ukjent kommando"
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 #, fuzzy
 msgid "Error joining channel."
 msgstr "Kommando: /join <kanal>"
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "Ukjent kommando"
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2806,11 +2696,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2820,189 +2710,137 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr "Avslo invitasjon fra %s."
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Kan ikke sende tomme meldinger!"
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Ukjent kommando"
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Spiller"
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -3016,71 +2854,116 @@ msgstr "Navn"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Slett"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3128,27 +3011,27 @@ msgstr "Denne kommandoen sender teksten <melding> til <brukernavn>."
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3224,15 +3107,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3240,15 +3123,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3256,15 +3139,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3323,7 +3206,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3331,242 +3214,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
-#, fuzzy, c-format
-msgid "Invited user %s to party."
-msgstr "/party > Inviter en bruker til en gruppe"
-
-#: src/net/tmwa/partyhandler.cpp:340
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3582,52 +3460,43 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
@@ -3646,6 +3515,21 @@ msgstr ""
 #~ msgid "Hyperlink"
 #~ msgstr "Hyperlenke"
 
+#~ msgid "Other Players' Names"
+#~ msgstr "Andre Spilleres Navn"
+
+#~ msgid "Own Name"
+#~ msgstr "Eget Navn"
+
+#~ msgid "GM Names"
+#~ msgstr "GM Navn"
+
+#~ msgid "NPCs"
+#~ msgstr "NPCer"
+
+#~ msgid "Monsters"
+#~ msgstr "Monstre"
+
 #~ msgid "Shirts"
 #~ msgstr "Skjorter"
 
@@ -3675,6 +3559,29 @@ msgstr ""
 #~ msgid "Ammo"
 #~ msgstr "Ammunisjon"
 
+#~ msgid "Particle Effects"
+#~ msgstr "Partikkeleffekter"
+
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
+
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
+
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Penger: %d"
+
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Jobb: %d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Nivå: %d"
+
 #~ msgid "no"
 #~ msgstr "nei"
 
diff --git a/po/nds.po b/po/nds.po
index a3e3c98e..7c11e2d6 100644
--- a/po/nds.po
+++ b/po/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-06-08 22:07+0000\n"
 "Last-Translator: Thorbjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: German, Low <nds@li.org>\n"
@@ -19,472 +19,452 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Setup"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "verbinde..."
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Login"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server:"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Passwort:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:274
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -493,39 +473,39 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -539,34 +519,34 @@ msgstr ""
 msgid "Buy"
 msgstr "kaufen"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -580,11 +560,11 @@ msgstr "Verkaufen"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -657,14 +637,14 @@ msgstr "Charakter erstellen"
 msgid "Name:"
 msgstr "Name:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -681,8 +661,8 @@ msgstr "Haarfarbe:"
 msgid "Hair style:"
 msgstr "Frisur:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "erstellen"
 
@@ -738,8 +718,8 @@ msgstr ""
 msgid "Change Email"
 msgstr "Email-Adresse ändern"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Löschen"
 
@@ -747,24 +727,24 @@ msgstr "Löschen"
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -830,8 +810,8 @@ msgstr ""
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -839,7 +819,7 @@ msgstr "Ablegen"
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
@@ -851,81 +831,84 @@ msgstr "Inventar"
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Benutzen"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Ablegen"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Ablegen"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Wirkung: %s"
@@ -955,40 +938,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -1002,7 +985,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1089,7 +1072,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1161,59 +1144,59 @@ msgstr "Das Passwort muss weniger als %d Buchstaben beinhalten."
 msgid "Passwords do not match."
 msgstr "Die Passwörter stimmen nicht überein."
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "verbinde..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1250,50 +1233,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1377,27 +1360,31 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1453,488 +1440,459 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Nein"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Fähigkeiten"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Fähigkeiten"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bist du dir sicher, dass du diesen Charakter löschen möchtest?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bist du dir sicher, dass du diesen Charakter löschen möchtest?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Charakter erstellen"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "Geld: %d"
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Level: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Du gibst:"
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Du gibst:"
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1973,78 +1931,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2121,53 +2007,53 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2191,479 +2077,492 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
 msgid "You Died"
 msgstr "Du gibst:"
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2742,11 +2641,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2756,187 +2655,134 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Willenskraft"
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Stärke"
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Intelligenz"
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2950,71 +2796,116 @@ msgstr "Name:"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Löschen"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3059,27 +2950,27 @@ msgstr ""
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3155,15 +3046,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3171,15 +3062,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3187,15 +3078,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3252,7 +3143,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3260,242 +3151,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3511,58 +3397,61 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Geld: %d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Level: %d"
+
 #~ msgid "Willpower:"
 #~ msgstr "Willenskraft"
 
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Willenskraft"
+
 #~ msgid "Description: %s"
 #~ msgstr "Beschreibung: %s"
 
diff --git a/po/nl.po b/po/nl.po
index 255a2806..82c2ca42 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-15 12:21+0000\n"
 "Last-Translator: Yentl <y.v.t@scarlet.be>\n"
 "Language-Team: Dutch\n"
@@ -19,418 +19,361 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/npcdialog.cpp:183
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Volgende"
-
-#: ../src/main.cpp:60
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : OpenGL uitschakelen voor deze sessie"
-
-#: ../src/main.cpp:58
-#, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir : Map te gebruiken als home"
-
-#: ../src/main.cpp:52
-#, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Gebruik deze updatehost"
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Configureren"
 
-#: ../src/main.cpp:46
+#: src/client.cpp:679
 #, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Gebruikte configuratiebestand"
+msgid "Connecting to server"
+msgstr "Verbinden met de map server..."
 
-#: ../src/main.cpp:53
+#: src/client.cpp:706
 #, fuzzy
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default : Kies standaard personageserver en personage"
+msgid "Logging in"
+msgstr "Inloggen"
 
-#: ../src/main.cpp:57
-#, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir : Map te gebruiken als home"
+#: src/client.cpp:739
+msgid "Entering game world"
+msgstr ""
 
-#: ../src/main.cpp:48
+#: src/client.cpp:804
 #, fuzzy
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Login met dit wachtwoord"
+msgid "Requesting characters"
+msgstr "Kies Personage"
 
-#: ../src/main.cpp:47
+#: src/client.cpp:833
 #, fuzzy
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Login met deze gebruikersnaam"
+msgid "Connecting to the game server"
+msgstr "Verbinden met de map server..."
 
-#: ../src/main.cpp:49
+#: src/client.cpp:843
 #, fuzzy
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Login met dit personage"
+msgid "Changing game servers"
+msgstr "Server"
 
-#: ../src/main.cpp:56
-#, fuzzy
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Map waarvan speldata geladen wordt"
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Fout"
 
-#: ../src/main.cpp:45
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help : Deze help weergeven"
+#: src/client.cpp:888
+msgid "Requesting registration details"
+msgstr ""
 
-#: ../src/main.cpp:51
+#: src/client.cpp:915
 #, fuzzy
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Loginserver poort"
+msgid "Password Change"
+msgstr "Wachtwoord:"
 
-#: ../src/main.cpp:50
-#, fuzzy
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Loginserver naam of IP-adres"
+#: src/client.cpp:916
+msgid "Password changed successfully!"
+msgstr ""
 
-#: ../src/main.cpp:55
+#: src/client.cpp:935
 #, fuzzy
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Sla update downloads over"
+msgid "Email Change"
+msgstr "Veranderen"
 
-#: ../src/main.cpp:44
+#: src/client.cpp:936
 #, fuzzy
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Versie weergeven"
-
-#: ../src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1 Het is ten sterkste aanbevolen dat"
-
-#: ../src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1 Het updateproces is onvolledig."
+msgid "Email changed successfully!"
+msgstr "Lid is succesvol gepromoveerd."
 
-#: ../src/gui/updatewindow.cpp:421
+#: src/client.cpp:956
 #, fuzzy
-msgid "##1  you try again later."
-msgstr "##1 je later opnieuw probeert"
-
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Nauwkeurigheid:"
-
-#: ../src/net/tmwa/generalhandler.cpp:230
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "Kritieke aanval"
-
-#: ../src/net/tmwa/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% Ontwijking:"
-
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr ""
+msgid "Unregister Successful"
+msgstr "Registreren"
 
-#: ../src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
+#: src/client.cpp:957
+msgid "Farewell, come back any time..."
 msgstr ""
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:291
+#: src/client.cpp:1281
 #, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s heeft zich bij de groep gevoegd."
+msgid "Invalid update host: %s"
+msgstr "Ongeldige updatahost: "
 
-#: ../src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
+#: src/client.cpp:1315 src/client.cpp:1321
+msgid "Error creating updates directory!"
+msgstr "Fout bij het creëren van de update map!"
 
-#: ../src/gui/socialwindow.cpp:561
-#, fuzzy, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
+msgid "Unknown command."
+msgstr "Onbekend commando."
 
-#: ../src/gui/socialwindow.cpp:600
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
+#: src/commandhandler.cpp:160
+msgid "-- Help --"
+msgstr "-- Help --"
 
-#: ../src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#: src/commandhandler.cpp:161
+msgid "/help > Display this help"
+msgstr "/help > Deze help weergeven"
 
-#: ../src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s heeft jouw groep verlaten."
+#: src/commandhandler.cpp:163
+msgid "/where > Display map name"
+msgstr "/where > Mapnaam weergeven"
 
-#: ../src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#: src/commandhandler.cpp:164
+msgid "/who > Display number of online users"
+msgstr "/who > Aantal online gebruikers weergeven"
 
-#: ../src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s is al een lid van een groep."
+#: src/commandhandler.cpp:165
+msgid "/me > Tell something about yourself"
+msgstr "/me > Vertel iets over jezelf"
 
-#: ../src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s is niet in jouw groep!"
+#: src/commandhandler.cpp:167
+msgid "/clear > Clears this window"
+msgstr "/clear > Maak dit venster leeg"
 
-#: ../src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s is nu een lid van jouw groep."
+#: src/commandhandler.cpp:169
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Zend een privébericht naar een gebruiker"
 
-#: ../src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s heeft zich bij de groep gevoegd."
+#: src/commandhandler.cpp:170
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > zelfde functie als msg"
 
-#: ../src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
+#: src/commandhandler.cpp:171
+msgid "/w > Alias of msg"
+msgstr "/w > zelfde als msg"
+
+#: src/commandhandler.cpp:172
+msgid "/query > Makes a tab for private messages with another user"
+msgstr "/query > Maakt een tabblad voor privéberichten met andere gebruikers"
+
+#: src/commandhandler.cpp:174
+msgid "/q > Alias of query"
+msgstr "/q > zelfde functie als query"
+
+#: src/commandhandler.cpp:176
+msgid "/ignore > ignore a player"
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s wees jouw uitnodiging af."
+#: src/commandhandler.cpp:177
+msgid "/unignore > stop ignoring a player"
+msgstr ""
 
-#: ../src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s wees jouw uitnodiging af."
+#: src/commandhandler.cpp:179
+msgid "/list > Display all public channels"
+msgstr "/list > Alle publieke kanalen weergeven"
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s wil met jou handelen, aanvaard je dit?"
+#: src/commandhandler.cpp:180
+msgid "/join > Join or create a channel"
+msgstr "/join > Een kanaal creëren of bij aansluiten"
 
-#: ../src/gui/widgets/chattab.cpp:152
-#, fuzzy, c-format
-msgid "%s whispers: %s"
-msgstr "%s fluistert: "
+#: src/commandhandler.cpp:182
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Creëer een nieuwe groep"
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
-msgid "(empty)"
-msgstr ""
+#: src/commandhandler.cpp:183
+msgid "/party > Invite a user to party"
+msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: ../src/commandhandler.cpp:222
-msgid "*** only available to a GM ***"
-msgstr "*** enkel mogelijk door een GM ***"
+#: src/commandhandler.cpp:185
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > De chat beginnen opnemen naar een extern bestand"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
-msgid "+"
-msgstr ""
+#: src/commandhandler.cpp:187
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr "/toggle > Bepalen of <return> de chatlog wisselt"
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
-msgid "-"
+#: src/commandhandler.cpp:189
+msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
+"/present > Lijst weergeven met alle aanwezige spelers (opgeslagen in "
+"chatlog, als logging aanstaat)"
 
-#: ../src/commandhandler.cpp:166
-msgid "-- Help --"
-msgstr "-- Help --"
-
-#: ../src/commandhandler.cpp:201
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globale aankondiging (enkel GM)"
 
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: ../src/commandhandler.cpp:173
-msgid "/clear > Clears this window"
-msgstr "/clear > Maak dit venster leeg"
+#: src/commandhandler.cpp:196
+msgid "For more information, type /help <command>."
+msgstr "Voor meer informatie, typ /help <commando>."
 
-#: ../src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Sluit de fluistertab"
+#: src/commandhandler.cpp:200
+msgid "Command: /help"
+msgstr "Commando: /help"
 
-#: ../src/commandhandler.cpp:191
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Creëer een nieuwe groep"
+#: src/commandhandler.cpp:201
+msgid "This command displays a list of all commands available."
+msgstr "Dit commando geeft een lijst weer van alle mogelijke commando's"
 
-#: ../src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Geeft weer/wijzigt de ervaringsdelingsopties"
+#: src/commandhandler.cpp:203
+msgid "Command: /help <command>"
+msgstr "Commando: /help <commando>"
 
-#: ../src/commandhandler.cpp:167
-msgid "/help > Display this help"
-msgstr "/help > Deze help weergeven"
+#: src/commandhandler.cpp:204
+msgid "This command displays help on <command>."
+msgstr "Dit commando geeft help weer van <commando>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Geeft deze help weer."
+#: src/commandhandler.cpp:212
+msgid "Command: /announce <msg>"
+msgstr "Commando: /announce <msg>"
 
-#: ../src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
-msgstr ""
+#: src/commandhandler.cpp:213
+msgid "*** only available to a GM ***"
+msgstr "*** enkel mogelijk door een GM ***"
 
-#: ../src/commandhandler.cpp:185
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:214
+msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
+"Dit commando stuurt het bericht <msg> naar alle spelers momenteel online."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Nodig een speler uit voor jouw groep"
-
-#: ../src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Nodig een speler uit voor jouw groep"
-
-#: ../src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > Geeft weer/wijzigt de opties voor voorwerpdeling"
-
-#: ../src/commandhandler.cpp:189
-msgid "/join > Join or create a channel"
-msgstr "/join > Een kanaal creëren of bij aansluiten"
+#: src/commandhandler.cpp:219
+msgid "Command: /clear"
+msgstr "Commando: /clear"
 
-#: ../src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Verwijdert een gebruiker van het kanaal"
+#: src/commandhandler.cpp:220
+msgid "This command clears the chat log of previous chat."
+msgstr "Dit commando maakt de chatlog van vorige chatsessies leeg"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
+#: src/commandhandler.cpp:224
 #, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Verwijder iemand vanuit de groep waarin je bent"
-
-#: ../src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Verwijder iemand vanuit de groep waarin je bent"
+msgid "Command: /ignore <player>"
+msgstr "Commando: /item <beleid>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
+#: src/commandhandler.cpp:225
 #, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Verlaat de groep waarin je je bevindt"
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Verlaat de groep waarin je je bevindt"
+#: src/commandhandler.cpp:230
+msgid "Command: /join <channel>"
+msgstr "Commando: /join <kanaal>"
 
-#: ../src/commandhandler.cpp:188
-msgid "/list > Display all public channels"
-msgstr "/list > Alle publieke kanalen weergeven"
+#: src/commandhandler.cpp:231
+msgid "This command makes you enter <channel>."
+msgstr "Dit commando voegt je toe op kanaal <kanaal>."
 
-#: ../src/commandhandler.cpp:171
-msgid "/me > Tell something about yourself"
-msgstr "/me > Vertel iets over jezelf"
+#: src/commandhandler.cpp:232
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Als <kanaal> niet bestaat, wordt het aangemaakt."
 
-#: ../src/commandhandler.cpp:175
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Zend een privébericht naar een gebruiker"
+#: src/commandhandler.cpp:236
+msgid "Command: /list"
+msgstr "Commando: /list"
 
-#: ../src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Maakt een gebruiker een kanaalbeheerder"
+#: src/commandhandler.cpp:237
+msgid "This command shows a list of all channels."
+msgstr "Dit commando geeft een lijst weer van alle kanalen."
 
-#: ../src/commandhandler.cpp:192
-msgid "/party > Invite a user to party"
-msgstr "/party > Een gebruiker uitnodigen in de groep"
+#: src/commandhandler.cpp:241
+msgid "Command: /me <message>"
+msgstr "Commando /me <bericht>"
 
-#: ../src/commandhandler.cpp:198
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Lijst weergeven met alle aanwezige spelers (opgeslagen in "
-"chatlog, als logging aanstaat)"
+#: src/commandhandler.cpp:242
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Dit commando vertelt anderen dat je <msg> bent/doet."
 
-#: ../src/commandhandler.cpp:180
-msgid "/q > Alias of query"
-msgstr "/q > zelfde functie als query"
+#: src/commandhandler.cpp:246
+msgid "Command: /msg <nick> <message>"
+msgstr "Commando: /msg <nick> <bericht>"
 
-#: ../src/commandhandler.cpp:178
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Maakt een tabblad voor privéberichten met andere gebruikers"
+#: src/commandhandler.cpp:247
+msgid "Command: /whisper <nick> <message>"
+msgstr "Commando: /msg <nick> <bericht>"
 
-#: ../src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Verlaat een kanaal"
+#: src/commandhandler.cpp:248
+msgid "Command: /w <nick> <message>"
+msgstr "Commando: /w <nick> <bericht>"
 
-#: ../src/commandhandler.cpp:194
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > De chat beginnen opnemen naar een extern bestand"
+#: src/commandhandler.cpp:249
+msgid "This command sends the text <message> to <nick>."
+msgstr "Dit commando zendt de tekst <bericht> aan <nick>."
 
-#: ../src/commandhandler.cpp:196
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Bepalen of <return> de chatlog wisselt"
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+"Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens "
+"(\")."
 
-#: ../src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > stel het onderwerp van het huidig kanaal in"
+#: src/commandhandler.cpp:255
+msgid "Command: /query <nick>"
+msgstr "Commando: /query <nick>"
 
-#: ../src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+#: src/commandhandler.cpp:256
+msgid "Command: /q <nick>"
+msgstr "Commando: /q <nick>"
 
-#: ../src/commandhandler.cpp:186
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:257
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
+"Dit commando probeert een tabblad aan te maken voor alle whispers tussen jou "
+"en <nick>"
 
-#: ../src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Lijst van gebruikers in het huidig kanaal weergeven"
+#: src/commandhandler.cpp:262
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Commando: /create <groepsnaam>"
 
-#: ../src/commandhandler.cpp:177
-msgid "/w > Alias of msg"
-msgstr "/w > zelfde als msg"
+#: src/commandhandler.cpp:263
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Dit commando creëert een nieuwe groep genaamd <groepsnaam>"
 
-#: ../src/commandhandler.cpp:169
-msgid "/where > Display map name"
-msgstr "/where > Mapnaam weergeven"
+#: src/commandhandler.cpp:267
+msgid "Command: /party <nick>"
+msgstr "Commando: /party <nick>"
 
-#: ../src/commandhandler.cpp:176
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > zelfde functie als msg"
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
 
-#: ../src/commandhandler.cpp:170
-msgid "/who > Display number of online users"
-msgstr "/who > Aantal online gebruikers weergeven"
+#: src/commandhandler.cpp:274
+msgid "Command: /present"
+msgstr "Commando: /present"
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
-msgid "<"
+#: src/commandhandler.cpp:275
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
 msgstr ""
+"Dit commando haalt een lijst op van spelers die je kunnen horen en zendt dit "
+"naar ofwel het logboek als dit opgeslagen wordt, of anders naar de chatlog."
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+#: src/commandhandler.cpp:281
+msgid "Command: /record <filename>"
+msgstr "Commando: /record <bestandsnaam>"
+
+#: src/commandhandler.cpp:282
+msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
-"<beleid> kan een van de volgende zijn om ervaringsdeling in te schakelen: "
-"\"1\", \"true\", \"yes\". Of om ervaringsdeling uit te schakelen: \"0\", "
-"\"false\", \"no\"."
+"Dit commando begint de chat log op te slaan naar het bestand <bestandsnaam>."
+
+#: src/commandhandler.cpp:284
+msgid "Command: /record"
+msgstr "Commando: /record"
+
+#: src/commandhandler.cpp:285
+msgid "This command finishes a recording session."
+msgstr "Dit commando beëindigt het opslaan van de chatlog."
+
+#: src/commandhandler.cpp:289
+msgid "Command: /toggle <state>"
+msgstr "Commando: /toggle <status>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/commandhandler.cpp:290
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
-"<beleid> kan een van de volgende zijn om voorwerpdeling in te schakelen: "
-"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", \"no"
-"\", \"false\"."
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -438,3654 +381,3600 @@ msgstr ""
 "<status> kan \"1\", \"yes\", \"true\" zijn om het in te schakelen, of \"0\", "
 "\"no\", \"false\" om het uit te schakelen."
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ""
+#: src/commandhandler.cpp:295
+msgid "Command: /toggle"
+msgstr "Commando: /toggle"
 
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: src/commandhandler.cpp:296
+msgid "This command displays the return toggle status."
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:566
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
-msgid "Accept Guild Invite"
-msgstr "Groepsuitnodiging aanvaarden"
-
-#: ../src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Groepsuitnodiging aanvaarden"
-
-#: ../src/gui/socialwindow.cpp:466
-#, fuzzy, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Uitnodiging van %s aanvaard."
-
-#: ../src/gui/socialwindow.cpp:447
-#, fuzzy, c-format
-msgid "Accepted party invite from %s."
-msgstr "Uitnodiging van %s aanvaard."
-
-#: ../src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Inkomende handelsaanvragen accepteren"
-
-#: ../src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Inkomende handelsaanvragen accepteren."
+msgid "Command: /unignore <player>"
+msgstr "Commando: /item <beleid>"
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
+#: src/commandhandler.cpp:301
+msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Account en personage beheer"
+#: src/commandhandler.cpp:306
+msgid "Command: /where"
+msgstr "Commando: /where"
 
-#: ../src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Account banned"
-msgstr "Account verlopen"
+#: src/commandhandler.cpp:307
+msgid "This command displays the name of the current map."
+msgstr "Dit commando geeft de naam weer van de huidige map."
 
-#: ../src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Account banned."
-msgstr "Account verlopen"
+#: src/commandhandler.cpp:311
+msgid "Command: /who"
+msgstr "Commando: /who"
 
-#: ../src/net/tmwa/loginhandler.cpp:162
-#, fuzzy
-msgid "Account expired."
-msgstr "Account verlopen"
+#: src/commandhandler.cpp:312
+msgid "This command displays the number of players currently online."
+msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Account niet verbonden. Log eerst in aub."
+#: src/commandhandler.cpp:318
+msgid "Type /help for a list of commands."
+msgstr "Type /help voor een lijst van commando's."
 
-#: ../src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
+#: src/commandhandler.cpp:384
+msgid "Cannot send empty whispers!"
+msgstr "Kan geen lege berichten sturen!"
 
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
+#: src/commandhandler.cpp:392
 #, c-format
-msgid "Account: %s"
-msgstr "Account: %s"
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
 
-#: ../src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Toevoegen"
+#: src/commandhandler.cpp:406
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: ../src/gui/popupmenu.cpp:171
-msgid "Add name to chat"
-msgstr ""
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Groepsnaam ontbreekt."
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
-msgid "Add to chat"
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
+msgid "Please specify a name."
 msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Behendigheid"
+#: src/commandhandler.cpp:450
+msgid "Return toggles chat."
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "Behandigheid %+d"
+#: src/commandhandler.cpp:450
+msgid "Message closes chat."
+msgstr "Bericht sluit chat."
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Agiliteit:"
+#: src/commandhandler.cpp:459
+msgid "Return now toggles chat."
+msgstr ""
 
-#: ../src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Handel goedkeuren"
+#: src/commandhandler.cpp:463
+msgid "Message now closes chat."
+msgstr "Bericht sluit nu chat."
 
-#: ../src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Goedgekeurd. Wachten..."
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
 
-#: ../src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "Alle"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Handelen toestaan"
+#: src/commandhandler.cpp:515
+msgid "Player already ignored!"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Fluisteren toestaan"
+#: src/commandhandler.cpp:522
+#, fuzzy
+msgid "Player successfully ignored!"
+msgstr "Groep succesvol aangemaakt."
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
+#: src/commandhandler.cpp:524
 #, fuzzy
-msgid "Already logged in."
-msgstr "Reeds aangemeld"
+msgid "Player could not be ignored!"
+msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: ../src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Reeds aan het opnemen."
+#: src/commandhandler.cpp:539
+msgid "Player wasn't ignored!"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Omgevingseffecten"
+#: src/commandhandler.cpp:544
+msgid "Player no longer ignored!"
+msgstr ""
 
-#: ../src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "Omgevingseffecten"
+#: src/commandhandler.cpp:546
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/commandhandler.h:31
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Een onbekend lid probeerde te zeggen: %s"
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Verslagen"
+#: src/game.cpp:172
+msgid "General"
+msgstr "Algemeen"
 
-#: ../src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Toepassen"
+#: src/game.cpp:342
+#, fuzzy
+msgid "Screenshot saved as "
+msgstr "Screenshot opgeslagen naar ~/"
 
-#: ../src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
+#: src/game.cpp:347
+msgid "Saving screenshot failed!"
+msgstr "Opslaan van screenshot mislukt!"
 
-#: ../src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
+#: src/game.cpp:378
+#, fuzzy
+msgid "The connection to the server was lost."
 msgstr ""
+"De verbinding met de server is verloren gegaan, het programma zal nu "
+"afsluiten"
 
-#: ../src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
-
-#: ../src/gui/socialwindow.cpp:168
-#, fuzzy, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Weet u zeker dat u wilt afsluiten?"
+#: src/game.cpp:382
+msgid "Network Error"
+msgstr "Netwerkfout"
 
-#: ../src/gui/socialwindow.cpp:247
-#, fuzzy, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Weet u zeker dat u wilt afsluiten?"
+#: src/game.cpp:721
+msgid "Ignoring incoming trade requests"
+msgstr "Inkomende handelsaanvragen negeren"
 
-#: ../src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Toewijzen"
+#: src/game.cpp:726
+msgid "Accepting incoming trade requests"
+msgstr "Inkomende handelsaanvragen accepteren"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Aanvallen"
+#: src/game.cpp:954
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Kan de map niet laden"
 
-#: ../src/resources/itemdb.cpp:53
+#: src/game.cpp:955
 #, c-format
-msgid "Attack %+d"
-msgstr "Aanval %+d"
+msgid "Error while loading %s"
+msgstr "Fout bij het laden van %s"
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Aanval %+d"
-
-#: ../src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "Aanwezigheid geschreven in logbestand."
-
-#: ../src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Audio"
-
-#: ../src/net/tmwa/generalhandler.cpp:129
-#, fuzzy
-msgid "Authentication failed."
-msgstr "Authenticatie mislukt"
+msgid "Party: %s"
+msgstr "Groep (%s)"
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
-msgstr ""
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Kopen"
 
-#: ../src/gui/popupmenu.cpp:100
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
-msgid "Befriend %s"
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Wezen"
-
-#: ../src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Beroofd van het leven, rust je in vrede."
+msgid "Price: %s / Total: %s"
+msgstr "Prijs: %s / Totaal: %s"
 
-#: ../src/playerrelations.cpp:342
-msgid "Blink name"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
+msgid "+"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:138
-#, fuzzy
-msgid "Blue:"
-msgstr "Blauw: "
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
+msgid "-"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Bellen met namen"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Afsluiten"
 
-#: ../src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Bellen, geen namen"
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
+msgid "Max"
+msgstr "Maximum"
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Kopen"
+#: src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Winkel"
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Kalibreren"
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Verkopen"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../src/commandhandler.cpp:422
-#, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-
-#: ../src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
-msgstr ""
-
-#: ../src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
-msgstr ""
-
-#: ../src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "Kan geen leeg chatbericht sturen!"
-
-#: ../src/commandhandler.cpp:401
-msgid "Cannot send empty whispers!"
-msgstr "Kan geen lege berichten sturen!"
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Emailadres wijzigen"
 
-#: ../src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Kan niet roepen!"
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#, c-format
+msgid "Account: %s"
+msgstr "Account: %s"
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
+#: src/gui/changeemaildialog.cpp:51
 #, fuzzy
-msgid "Cannot use this ID."
-msgstr "Kan deze ID niet gebruiken"
-
-#: ../src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Veranderen"
+msgid "Type new email address twice:"
+msgstr "Typ nieuw emailadres tweemaal:"
 
-#: ../src/gui/charselectdialog.cpp:150
-#, fuzzy
-msgid "Change Email"
-msgstr "Emailadres wijzigen"
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Emailadres wijzigen"
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
 
-#: ../src/gui/worldselectdialog.cpp:76
+#: src/gui/changeemaildialog.cpp:141
 #, fuzzy
-msgid "Change Login"
-msgstr "Veranderen"
+msgid "The email address entries mismatch."
+msgstr "Het nieuwe emailadres bestaat al."
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
-#: ../src/gui/login.cpp:62
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Wachtwoord:"
+
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
-msgid "Change Server"
-msgstr "Server"
+msgid "Type new password twice:"
+msgstr "Typ nieuw wachtwoord tweemaal:"
 
-#: ../src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "Wijzigingen treden in werking bij het wisselen van map."
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
 
-#: ../src/client.cpp:813
-#, fuzzy
-msgid "Changing game servers"
-msgstr "Server"
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
 
-#: ../src/gui/setup_video.cpp:460
-#, fuzzy
-msgid "Changing to OpenGL"
-msgstr "Veranderen van OpenGL"
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 
-#: ../src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
 msgstr ""
-"Kanaalbeheerders kunnen andere gebruikers uit het kanaal verwijderen en "
-"andere gebruikers kanaalbeheerders maken."
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "Kanalen worden niet ondersteund!"
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Personage Aanmaken"
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Personage verwijderd."
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Naam:"
 
-#: ../src/gui/statuswindow.cpp:238
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Attributen van personage OK"
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Attributen van personage OK"
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:143
+#: src/gui/charcreatedialog.cpp:74
 #, fuzzy
-msgid "Character's name already exists."
-msgstr "Gebruikersnaam bestaat al"
+msgid "Hair color:"
+msgstr "Haarkleur:"
 
-#: ../src/net/manaserv/charhandler.cpp:155
+#: src/gui/charcreatedialog.cpp:77
 #, fuzzy
-msgid "Character's stats are too high."
-msgstr "Attributen van personage OK"
+msgid "Hair style:"
+msgstr "Haarstijl:"
 
-#: ../src/net/manaserv/charhandler.cpp:158
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Attributen van personage OK"
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
+msgid "Create"
+msgstr "Aanmaken"
 
-#: ../src/gui/chat.cpp:87
-msgid "Chat"
-msgstr "Chat"
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "Mannelijk"
 
-#: ../src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Gespreksvenster"
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "Vrouwelijk"
 
-#: ../src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Chatcreatie mislukte!"
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Nog %d punten te verdelen"
 
-#: ../src/gui/charselectdialog.cpp:380
-#, fuzzy
-msgid "Choose"
-msgstr "Sluiten"
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "Je naam moet uit tenminste 4 tekens bestaan"
 
-#: ../src/gui/worldselectdialog.cpp:77
-#, fuzzy
-msgid "Choose World"
-msgstr "Kies jouw server"
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
+msgstr "Attributen van personage OK"
 
-#: ../src/gui/serverdialog.cpp:196
-#, fuzzy
-msgid "Choose Your Server"
-msgstr "Kies jouw server"
+#: src/gui/charcreatedialog.cpp:256
+#, c-format
+msgid "Please remove %d points"
+msgstr "Verwijder alstublieft %d punten"
 
-#: ../src/gui/socialwindow.cpp:544
-#, fuzzy
-msgid "Choose your guild's name."
-msgstr "Kies jouw server"
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Bevestig het verwijderen van het personage"
 
-#: ../src/gui/socialwindow.cpp:630
-#, fuzzy
-msgid "Choose your party's name."
-msgstr "Kies jouw server"
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: ../src/gui/npcdialog.cpp:98
-msgid "Clear log"
-msgstr ""
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr "Account en personage beheer"
 
-#: ../src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
-#, fuzzy
-msgid "Client version is too old."
-msgstr "Te oude Client versie"
-
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
-msgid "Close"
-msgstr "Sluiten"
-
-#: ../src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Kleuren"
-
-#: ../src/commandhandler.cpp:221
-msgid "Command: /announce <msg>"
-msgstr "Commando: /announce <msg>"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Registreren"
 
-#: ../src/commandhandler.cpp:274
+#: src/gui/charselectdialog.cpp:150
 #, fuzzy
-msgid "Command: /away"
-msgstr "Commando: /who"
+msgid "Change Email"
+msgstr "Emailadres wijzigen"
 
-#: ../src/commandhandler.cpp:271
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Commando: /w <nick> <bericht>"
+msgid "Choose"
+msgstr "Sluiten"
 
-#: ../src/commandhandler.cpp:228
-msgid "Command: /clear"
-msgstr "Commando: /clear"
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
+msgid "(empty)"
+msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Commando: /close"
+#: src/gui/chat.cpp:88
+msgid "Chat"
+msgstr "Chat"
 
-#: ../src/commandhandler.cpp:279
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Commando: /create <groepsnaam>"
+#: src/gui/chat.cpp:311
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
+msgstr "%d spelers zijn aanwezig."
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Commando: /exp"
+#: src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Aanwezigheid geschreven in logbestand."
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Commando: /exp <beleid>"
+#: src/gui/chat.cpp:493
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Fluisteren naar %s: %s"
 
-#: ../src/commandhandler.cpp:209
-msgid "Command: /help"
-msgstr "Commando: /help"
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Ja"
 
-#: ../src/commandhandler.cpp:212
-msgid "Command: /help <command>"
-msgstr "Commando: /help <commando>"
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Nee"
 
-#: ../src/gui/widgets/whispertab.cpp:88
-#, fuzzy
-msgid "Command: /ignore"
-msgstr "Commando: /item"
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: ../src/commandhandler.cpp:233
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Commando: /item <beleid>"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Commando: /invite <nick>"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Commando: /item"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, fuzzy, c-format
+msgid "Music: %s"
+msgstr "Onderwerp: %s"
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Commando: /item <beleid>"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Naam: %s"
 
-#: ../src/commandhandler.cpp:239
-msgid "Command: /join <channel>"
-msgstr "Commando: /join <kanaal>"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "Kaartje"
 
-#: ../src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Commando: /kick <nick>"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Commando: /leave"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Deeltjes effecten"
 
-#: ../src/commandhandler.cpp:245
-msgid "Command: /list"
-msgstr "Commando: /list"
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Deeltjes details"
 
-#: ../src/commandhandler.cpp:250
-msgid "Command: /me <message>"
-msgstr "Commando /me <bericht>"
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Omgevingseffecten"
 
-#: ../src/commandhandler.cpp:255
-msgid "Command: /msg <nick> <message>"
-msgstr "Commando: /msg <nick> <bericht>"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Uitrusting"
 
-#: ../src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Commando: /op <nick>"
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
+msgid "Unequip"
+msgstr "Afdoen"
 
-#: ../src/commandhandler.cpp:284
-msgid "Command: /party <nick>"
-msgstr "Commando: /party <nick>"
+#: src/gui/help.cpp:37
+msgid "Help"
+msgstr "Help"
 
-#: ../src/commandhandler.cpp:291
-msgid "Command: /present"
-msgstr "Commando: /present"
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
+msgid "Close"
+msgstr "Sluiten"
 
-#: ../src/commandhandler.cpp:265
-msgid "Command: /q <nick>"
-msgstr "Commando: /q <nick>"
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inventaris"
 
-#: ../src/commandhandler.cpp:264
-msgid "Command: /query <nick>"
-msgstr "Commando: /query <nick>"
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Opslag"
 
-#: ../src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Commando: /quit"
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Sloten:"
 
-#: ../src/commandhandler.cpp:301
-msgid "Command: /record"
-msgstr "Commando: /record"
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
+msgid "Equip"
+msgstr "Uitrusten"
 
-#: ../src/commandhandler.cpp:298
-msgid "Command: /record <filename>"
-msgstr "Commando: /record <bestandsnaam>"
+#: src/gui/inventorywindow.cpp:88
+msgid "Use"
+msgstr "Gebruiken"
 
-#: ../src/commandhandler.cpp:312
-msgid "Command: /toggle"
-msgstr "Commando: /toggle"
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
 
-#: ../src/commandhandler.cpp:306
-msgid "Command: /toggle <state>"
-msgstr "Commando: /toggle <status>"
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
+#, fuzzy
+msgid "Drop..."
+msgstr "Neerleggen"
 
-#: ../src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Commando: /topic <bericht>"
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
+msgid "Split"
+msgstr "Splitsen"
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Commando: /item <beleid>"
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Commando: /users"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
+msgstr "Gewicht:"
 
-#: ../src/commandhandler.cpp:257
-msgid "Command: /w <nick> <message>"
-msgstr "Commando: /w <nick> <bericht>"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Opslaan"
 
-#: ../src/commandhandler.cpp:323
-msgid "Command: /where"
-msgstr "Commando: /where"
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Afhalen"
 
-#: ../src/commandhandler.cpp:256
-msgid "Command: /whisper <nick> <message>"
-msgstr "Commando: /msg <nick> <bericht>"
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
+msgid "Drop"
+msgstr "Neerleggen"
 
-#: ../src/commandhandler.cpp:328
-msgid "Command: /who"
-msgstr "Commando: /who"
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
+msgid "OK"
+msgstr "OK"
 
-#: ../src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Voltooid"
+#: src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Alle"
 
-#: ../src/playerrelations.cpp:312
-#, fuzzy
-msgid "Completely ignore"
-msgstr "Voltooid"
+#: src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: ../src/gui/popupmenu.cpp:117
-#, c-format
-msgid "Completely ignore %s"
-msgstr ""
+#: src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
-#: ../src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Bevestig het verwijderen van het personage"
+#: src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
-#: ../src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Bevestigen:"
+#: src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
-#: ../src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Bevestigd. Wachten..."
+#: src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
-#: ../src/keyboardconfig.cpp:184
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr "Los deze problemen op, of het spel kan raar gedrag vertonen."
+msgid "Weight: %s"
+msgstr "Gewicht "
+
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
+msgid "Login"
+msgstr "Inloggen"
 
-#: ../src/gui/serverdialog.cpp:233
+#: src/gui/login.cpp:60
 #, fuzzy
-msgid "Connect"
-msgstr "Verbinden..."
+msgid "Remember username"
+msgstr "Onthoud Naam"
+
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "Aanmelden"
 
-#: ../src/client.cpp:655
+#: src/gui/login.cpp:62
 #, fuzzy
-msgid "Connecting to server"
-msgstr "Verbinden met de map server..."
+msgid "Change Server"
+msgstr "Server"
 
-#: ../src/client.cpp:803
+#: src/gui/login.cpp:129
 #, fuzzy
-msgid "Connecting to the game server"
-msgstr "Verbinden met de map server..."
+msgid "Registration disabled"
+msgstr "Voorwerpdeling uitgeschakeld."
 
-#: ../src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Verbinden..."
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
 
-#: ../src/net/tmwa/network.cpp:414
-#, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Verbinden met de map server..."
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Map"
 
-#: ../src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/gui/ministatus.cpp:235
+msgid "Need"
 msgstr ""
 
-#: ../src/gui/statuswindow.cpp:244
-#, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Vaardigheidspunten: %d"
+#: src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Wachten op server"
 
-#: ../src/game.cpp:950
-#, fuzzy
-msgid "Could Not Load Map"
-msgstr "Kan de map niet laden"
+#: src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Volgende"
 
-#: ../src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "Kan geen groep aanmaken."
+#: src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Indienen"
 
-#: ../src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Kan je niet bij de groep voegen!"
+#: src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Reset"
 
-#: ../src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "Kon niets stelen..."
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:208
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Volgende"
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Aanmaken"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Aan:"
 
-#: ../src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Personage Aanmaken"
+#: src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Verzenden"
 
-#: ../src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Guild aanmaken"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Kon niet zenden als zender, of de brief is ongeldig."
+
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
+#: src/gui/outfitwindow.cpp:70
 #, fuzzy
-msgid "Create Party"
-msgstr "Personage Aanmaken"
+msgid "Unequip first"
+msgstr "Afdoen"
 
-#: ../src/gui/socialwindow.cpp:507
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
-msgid "Creating guild called %s."
-msgstr "Fout bij het creëren van guild."
+msgid "Trade with %s..."
+msgstr "Handelen met %s"
 
-#: ../src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Aanval %+d"
+
+#: src/gui/popupmenu.cpp:91
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Fluister"
+
+#: src/gui/popupmenu.cpp:100
+#, c-format
+msgid "Befriend %s"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:529
+#: src/gui/popupmenu.cpp:105
 #, c-format
-msgid "Creating party called %s."
+msgid "Disregard %s"
 msgstr ""
 
-#: ../src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
+#: src/gui/popupmenu.cpp:108
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Genegeerd"
+
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
 msgstr ""
 
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Kritieke aanval"
+#: src/gui/popupmenu.cpp:117
+#, c-format
+msgid "Completely ignore %s"
+msgstr ""
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:234
+#: src/gui/popupmenu.cpp:134
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
+msgstr "%s is niet in jouw groep!"
+
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
-msgid "Custom Server"
-msgstr "Aangepaste cursor"
+msgid "Kick player"
+msgstr "Kick gefaald!"
 
-#: ../src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "Aangepaste cursor"
+#: src/gui/popupmenu.cpp:150
+#, c-format
+msgid "Talk to %s"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
+#: src/gui/popupmenu.cpp:163
+#, fuzzy
+msgid "Kick monster"
+msgstr "Monsters"
+
+#: src/gui/popupmenu.cpp:171
+msgid "Add name to chat"
 msgstr ""
 
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/popupmenu.cpp:188
+#, fuzzy, c-format
+msgid "Pick up %s"
+msgstr "Oprapen"
+
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
+msgid "Add to chat"
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Debugvenster"
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Van server wisselen"
 
-#: ../src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Standaard"
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Van personage wisselen"
 
-#: ../src/net/tmwa/generalhandler.cpp:225
-#, fuzzy
-msgid "Defense"
-msgstr "Verdediging:"
+#: src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Opname voltooid."
 
-#: ../src/resources/itemdb.cpp:54
-#, c-format
-msgid "Defense %+d"
-msgstr "Verdediging %+d"
+#: src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Momenteel niet aan het opnemen."
 
-#: ../src/gui/setup_colors.cpp:93
-#, fuzzy
-msgid "Delay:"
-msgstr "Vertraging: "
+#: src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Reeds aan het opnemen."
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Verwijderen"
+#: src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Opname starten..."
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Vaardigheid"
+#: src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Kan de opname niet starten."
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr "Vaardigheid %+d"
+#: src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Opnemen..."
 
-#: ../src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Dexteriteit:"
+#: src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Stoppen met opnemen"
 
-#: ../src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
-msgstr ""
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Bevestigen:"
 
-#: ../src/gui/popupmenu.cpp:105
-#, c-format
-msgid "Disregard %s"
-msgstr ""
+#: src/gui/register.cpp:100
+msgid "Email:"
+msgstr "E-mail:"
 
-#: ../src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr ""
+#: src/gui/register.cpp:166
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?"
+#: src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
 
-#: ../src/gui/setup_audio.cpp:43
-msgid "Download music"
-msgstr ""
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
 
-#: ../src/gui/serverdialog.cpp:442
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
-msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgid "The password needs to be less than %d characters long."
+msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
-msgid "Drop"
-msgstr "Neerleggen"
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Wachtwoorden komen niet overeen."
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
-msgid "Drop..."
-msgstr "Neerleggen"
+msgid "Choose Your Server"
+msgstr "Kies jouw server"
 
-#: ../src/net/tmwa/generalhandler.cpp:145
-#, fuzzy
-msgid "Duplicated login."
-msgstr "Dubbele login"
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Poort:"
 
-#: ../src/client.cpp:905
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
-msgid "Email Change"
-msgstr "Veranderen"
+msgid "Server type:"
+msgstr "Server:"
 
-#: ../src/net/manaserv/loginhandler.cpp:309
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
-msgid "Email address already exists."
-msgstr "emailadres bestaat al"
+msgid "Connect"
+msgstr "Verbinden..."
 
-#: ../src/client.cpp:906
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
-msgid "Email changed successfully!"
-msgstr "Lid is succesvol gepromoveerd."
+msgid "Custom Server"
+msgstr "Aangepaste cursor"
 
-#: ../src/gui/register.cpp:100
-msgid "Email:"
-msgstr "E-mail:"
+#: src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Typ aub zowel het adres van de server, als de poort."
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
+#: src/gui/serverdialog.cpp:441
 #, c-format
-msgid "Emote Shortcut %d"
-msgstr "Emoticon snelkoppeling %d"
-
-#: ../src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr "Emoticonsnelkoppelingsvenster"
-
-#: ../src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Emoticon gefaald!"
-
-#: ../src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:39
-msgid "Enable joystick"
-msgstr "Joystick activeren"
-
-#: ../src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Handelen inschakelen/uitschakelen"
+#: src/gui/serverdialog.cpp:447
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "Wachten op server"
 
-#: ../src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/gui/serverdialog.cpp:451
+msgid "Preparing download"
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
 msgstr ""
 
-#: ../src/client.cpp:715
-msgid "Entering game world"
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
-msgid "Equip"
-msgstr "Uitrusten"
-
-#: ../src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
 msgstr ""
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Uitrusting"
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Geluid"
 
-#: ../src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Uitrustingsvenster"
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "Fout"
+#: src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Audio"
 
-#: ../src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Fout bij het creëren van guild."
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Volume van geluiden"
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
-msgid "Error creating updates directory!"
-msgstr "Fout bij het creëren van de update map!"
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Muziek volume"
 
-#: ../src/net/manaserv/chathandler.cpp:201
+#: src/gui/setup_audio.cpp:94
 #, fuzzy
-msgid "Error joining channel."
-msgstr "Commando: /join <kanaal>"
+msgid "Notice"
+msgstr "Geen tekst"
 
-#: ../src/gui/serverdialog.cpp:456
-msgid "Error retreiving server list!"
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: ../src/game.cpp:951
-#, c-format
-msgid "Error while loading %s"
-msgstr "Fout bij het laden van %s"
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "Dit is hoe de kleur eruit ziet"
 
-#: ../src/gui/statuswindow.cpp:215
+#: src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Kleuren"
+
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
-msgid "Exp"
-msgstr "Ervaring:"
+msgid "Type:"
+msgstr "Type: "
 
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "Ervaring Notificatie"
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Statisch"
 
-#: ../src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "Ervaring:"
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Puls"
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr "Ervaringsdeling uitgeschakeld."
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Regenboog"
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr "Ervaringsdeling ingeschakeld."
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Spectrum"
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr "Ervaringsdeling is niet mogelijk."
+#: src/gui/setup_colors.cpp:94
+#, fuzzy
+msgid "Delay:"
+msgstr "Vertraging: "
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
-msgid "Experience sharing unknown."
-msgstr "Ervaringsdeling ingeschakeld."
+msgid "Red:"
+msgstr "Rood: "
 
-#: ../src/gui/setup_video.cpp:238
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
-msgid "FPS limit:"
-msgstr "FPS limiet:"
+msgid "Green:"
+msgstr "Groen: "
 
-#: ../src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
+#: src/gui/setup_colors.cpp:139
+#, fuzzy
+msgid "Blue:"
+msgstr "Blauw: "
 
-#: ../src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Toepassen"
 
-#: ../src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen."
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Vensters in beginstand"
 
-#: ../src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
-"het venster."
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Druk op de knop om het kalibreren te starten"
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Kalibreren"
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "Kon personage niet verwijderen."
+#: src/gui/setup_joystick.cpp:39
+msgid "Enable joystick"
+msgstr "Joystick activeren"
 
-#: ../src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Kon lid niet promoveren."
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: ../src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "Kon niet zenden als zender, of de brief is ongeldig."
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Stoppen"
 
-#: ../src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Kan de opname niet starten."
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Maak rondjes met de stick"
 
-#: ../src/gui/setup_video.cpp:434
-#, fuzzy
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "modus en herstel van oude modus ook gefaald!"
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Toetsenbord"
 
-#: ../src/gui/setup_video.cpp:428
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Toewijzen"
+
+#: src/gui/setup_keyboard.cpp:90
 #, fuzzy
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "modus en herstel van oude modus ook gefaald!"
+msgid "Unassign"
+msgstr "Toewijzen"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
-msgid "Failed to use item."
-msgstr "Kan voorwerp niet gebruiken."
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Standaard"
 
-#: ../src/client.cpp:927
-msgid "Farewell, come back any time..."
-msgstr ""
+#: src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
-msgid "Female"
-msgstr "Vrouwelijk"
+#: src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Naam"
 
-#: ../src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "Pad naar Muis vinden"
+#: src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Relatie"
 
-#: ../src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Opname voltooid."
+#: src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutraal"
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
+#: src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Vriend"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
+#: src/gui/setup_players.cpp:66
+msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Lettergrootte"
+#: src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Genegeerd"
 
-#: ../src/commandhandler.cpp:205
-msgid "For more information, type /help <command>."
-msgstr "Voor meer informatie, typ /help <commando>."
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
+msgid "???"
+msgstr "???"
 
-#: ../src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Vriend"
+#: src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Handelen toestaan"
 
-#: ../src/gui/setup_video.cpp:219
-msgid "Full screen"
-msgstr "Volledig scherm"
+#: src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Fluisteren toestaan"
 
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "GM Namen"
+#: src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr ""
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/gui/setup_players.cpp:233
 #, fuzzy
-msgid "Game"
-msgstr "Naam"
+msgid "Show gender"
+msgstr "Naam tonen"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Game Over!"
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Kan niets verkopen."
 
-#: ../src/game.cpp:169
-msgid "General"
-msgstr "Algemeen"
+#: src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Spelers"
 
-#: ../src/gui/widgets/chattab.cpp:126
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Globale aankondiging van %s:"
+#: src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "Tijdens negeren:"
 
-#: ../src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Globale aankondiging:"
+#: src/gui/setup_video.cpp:134
+msgid "Tiny"
+msgstr "Klein"
 
-#: ../src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
-msgstr "De verbinding met de server werd verbroken!"
+#: src/gui/setup_video.cpp:135
+msgid "Small"
+msgstr "Klein"
 
-#: ../src/gui/setup_colors.cpp:123
-#, fuzzy
-msgid "Green:"
-msgstr "Groen: "
+#: src/gui/setup_video.cpp:136
+msgid "Medium"
+msgstr "Middelmatig"
 
-#: ../src/gui/setup_video.cpp:261
-msgid "Gui opacity"
-msgstr "Dekking van de GUI"
+#: src/gui/setup_video.cpp:137
+msgid "Large"
+msgstr "Groot"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Guild"
+#: src/gui/setup_video.cpp:163
+msgid "No text"
+msgstr "Geen tekst"
 
-#: ../src/gui/socialwindow.cpp:143
-#, fuzzy, c-format
-msgid "Guild %s quit requested."
-msgstr "Guild aangemaakt."
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Tekst"
 
-#: ../src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Guild"
+#: src/gui/setup_video.cpp:165
+msgid "Bubbles, no names"
+msgstr "Bellen, geen namen"
 
-#: ../src/gui/socialwindow.cpp:543
-#, fuzzy
-msgid "Guild Name"
-msgstr "Guild"
+#: src/gui/setup_video.cpp:166
+msgid "Bubbles with names"
+msgstr "Bellen met namen"
 
-#: ../src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Guild aangemaakt."
+#: src/gui/setup_video.cpp:178
+msgid "off"
+msgstr "uit"
 
-#: ../src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
-msgstr ""
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
+msgid "low"
+msgstr "laag"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
-#, fuzzy
-msgid "Guild name is missing."
-msgstr "Groepsnaam ontbreekt."
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
+msgid "high"
+msgstr "hoog"
 
-#: ../src/gui/statuswindow.cpp:203
-#, fuzzy
-msgid "HP"
-msgstr "Leven:"
+#: src/gui/setup_video.cpp:193
+msgid "medium"
+msgstr "gemiddeld"
 
-#: ../src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "Leven %+d"
+#: src/gui/setup_video.cpp:195
+msgid "max"
+msgstr "max"
 
-#: ../src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "Leven:"
+#: src/gui/setup_video.cpp:217
+msgid "Full screen"
+msgstr "Volledig scherm"
 
-#: ../src/gui/charcreatedialog.cpp:74
-#, fuzzy
-msgid "Hair color:"
-msgstr "Haarkleur:"
+#: src/gui/setup_video.cpp:218
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: ../src/gui/charcreatedialog.cpp:77
-#, fuzzy
-msgid "Hair style:"
-msgstr "Haarstijl:"
+#: src/gui/setup_video.cpp:219
+msgid "Custom cursor"
+msgstr "Aangepaste cursor"
 
-#: ../src/gui/help.cpp:37
-msgid "Help"
-msgstr "Help"
+#: src/gui/setup_video.cpp:221
+msgid "Visible names"
+msgstr "Zichtbare namen"
 
-#: ../src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Help venster"
+#: src/gui/setup_video.cpp:223
+msgid "Particle effects"
+msgstr "Deeltjes effecten"
 
-#: ../src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Vensters verbergen"
+#: src/gui/setup_video.cpp:225
+#, fuzzy
+msgid "Show own name"
+msgstr "Naam tonen"
 
-#: ../src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Huh? Wat is dat?"
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Dit verliep niet zoals gepland."
+#: src/gui/setup_video.cpp:227
+msgid "Show pickup notification"
+msgstr "Notificatie bij oprapen weergeven"
 
-#: ../src/commandhandler.cpp:241
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Als <kanaal> niet bestaat, wordt het aangemaakt."
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
+msgid "in chat"
+msgstr "in chat"
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens "
-"(\")."
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
+msgid "as particle"
+msgstr "als deeltje"
 
-#: ../src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "FPS limit:"
+msgstr "FPS limiet:"
 
-#: ../src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
 msgstr ""
-"Als je de laatste persoon in het kanaal bent, zal het kanaal worden "
-"verwijderd."
 
-#: ../src/gui/popupmenu.cpp:108
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "Genegeerd"
+#: src/gui/setup_video.cpp:250
+msgid "Video"
+msgstr "Video"
 
-#: ../src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "Ingave 1 negeren"
+#: src/gui/setup_video.cpp:252
+#, fuzzy
+msgid "Show damage"
+msgstr "Naam tonen"
 
-#: ../src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "Ingave 2 negeren"
+#: src/gui/setup_video.cpp:258
+msgid "Overhead text"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Genegeerd"
+#: src/gui/setup_video.cpp:259
+msgid "Gui opacity"
+msgstr "Dekking van de GUI"
 
-#: ../src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Inkomende handelsaanvragen negeren"
+#: src/gui/setup_video.cpp:260
+msgid "Ambient FX"
+msgstr "Omgevingseffecten"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Inkomende handelsaanvragen negeren."
+#: src/gui/setup_video.cpp:261
+#, fuzzy
+msgid "Particle detail"
+msgstr "Deeltjes details"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Info"
+#: src/gui/setup_video.cpp:262
+msgid "Font size"
+msgstr "Lettergrootte"
 
-#: ../src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "Werp een muntstuk in om verder te spelen."
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
+#, fuzzy
+msgid "None"
+msgstr "Nee"
 
-#: ../src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "Onvoldoende leven!"
+#: src/gui/setup_video.cpp:426
+#, fuzzy
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "modus en herstel van oude modus ook gefaald!"
 
-#: ../src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "Onvoldoende Vaardigheidspunten!"
+#: src/gui/setup_video.cpp:432
+#, fuzzy
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr "modus en herstel van oude modus ook gefaald!"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Intelligentie"
+#: src/gui/setup_video.cpp:443
+#, fuzzy
+msgid "Switching to Full Screen"
+msgstr "Overgaan naar volledig scherm"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligentie %+d"
+#: src/gui/setup_video.cpp:444
+msgid "Restart needed for changes to take effect."
+msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: ../src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Intelligentie:"
+#: src/gui/setup_video.cpp:458
+#, fuzzy
+msgid "Changing to OpenGL"
+msgstr "Veranderen van OpenGL"
 
-#: ../src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
+#: src/gui/setup_video.cpp:467
+msgid "Applying change to OpenGL requires restart."
+msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
+
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Ervaringsdeling uitgeschakeld."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
 msgstr ""
 
-#: ../src/client.cpp:1244
-#, fuzzy, c-format
-msgid "Invalid update host: %s"
-msgstr "Ongeldige updatahost: "
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
+#, fuzzy
+msgid "Screen Resolution Changed"
+msgstr "Schermresolutie veranderd"
 
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inventaris"
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
+msgid "Restart your client for the change to take effect."
+msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
-#: ../src/keyboardconfig.cpp:72
-msgid "Inventory Window"
+#: src/gui/setup_video.cpp:579
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: ../src/localplayer.cpp:1254
+#: src/gui/setup_video.cpp:612
 #, fuzzy
-msgid "Inventory is full."
-msgstr "Server is volzet"
+msgid "Particle Effect Settings Changed."
+msgstr "Deeltjes effecten instellingen gewijzigd."
 
-#: ../src/gui/socialwindow.cpp:334
-#, fuzzy
-msgid "Invite"
-msgstr "Gebruiker uitnodigen"
+#: src/gui/setup_video.cpp:613
+msgid "Changes will take effect on map change."
+msgstr "Wijzigingen treden in werking bij het wisselen van map."
+
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Vaardigheden"
+
+#: src/gui/skilldialog.cpp:223
+msgid "Up"
+msgstr "Omhoog"
+
+#: src/gui/skilldialog.cpp:269
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Vaardigheidspunten: %d"
+
+#: src/gui/skilldialog.cpp:351
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Vaardigheidspunten: %d"
+
+#: src/gui/skilldialog.cpp:360
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Vaardigheden"
+
+#: src/gui/skilldialog.cpp:442
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Level: %d"
+
+#: src/gui/skilldialog.cpp:453
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Level: %d"
 
-#: ../src/gui/popupmenu.cpp:130
+#: src/gui/socialwindow.cpp:126
 #, c-format
-msgid "Invite %s to join your guild"
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:134
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "%s is niet in jouw groep!"
+msgid "Guild %s quit requested."
+msgstr "Guild aangemaakt."
 
-#: ../src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Uitnodiging verzonden."
+#: src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:154
 #, c-format
-msgid "Invited user %s to guild %s."
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:335
+#: src/gui/socialwindow.cpp:163
+#, fuzzy
+msgid "Leave Guild?"
+msgstr "Guild aanmaken"
+
+#: src/gui/socialwindow.cpp:164
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Weet u zeker dat u wilt afsluiten?"
+
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: ../src/net/tmwa/partyhandler.cpp:340
+#: src/gui/socialwindow.cpp:218
 #, c-format
-msgid "Inviting failed, because you can't see a player called %s."
+msgid "Party %s quit requested."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Snelkopeling naar voorwerp %d"
-
-#: ../src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Voorwerpsnelkoppelingsvenster"
+#: src/gui/socialwindow.cpp:232
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
+#: src/gui/socialwindow.cpp:233
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
+#: src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
-msgstr ""
+#: src/gui/socialwindow.cpp:243
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Weet u zeker dat u wilt afsluiten?"
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Voorwerpdeling uitgeschakeld."
+#: src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Guild aanmaken"
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Voorwerpdeling ingeschakeld."
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
+#, fuzzy
+msgid "Create Party"
+msgstr "Personage Aanmaken"
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "Voorwerpdeling is niet mogelijk."
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:141
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
-msgid "Item sharing unknown."
-msgstr "Voorwerpdeling ingeschakeld."
+msgid "Invite"
+msgstr "Gebruiker uitnodigen"
 
-#: ../src/gui/statuswindow.cpp:234
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
-msgid "Job"
-msgstr "Job:"
+msgid "Leave"
+msgstr "Groot"
 
-#: ../src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Job:"
+#: src/gui/socialwindow.cpp:443
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Uitnodiging van %s aanvaard."
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
-#, c-format
-msgid "Job: %d"
-msgstr "Job: %d"
+#: src/gui/socialwindow.cpp:449
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Uitnodiging van %s geweigerd."
 
-#: ../src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Bijgevoegd bij groep."
+#: src/gui/socialwindow.cpp:462
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Uitnodiging van %s aanvaard."
 
-#: ../src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: src/gui/socialwindow.cpp:468
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Uitnodiging van %s geweigerd."
 
-#: ../src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Conflict(en) tussen toetsen gevonden."
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Toetsenbord"
+#: src/gui/socialwindow.cpp:504
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Fout bij het creëren van guild."
 
-#: ../src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Kick gefaald!"
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:163
+#: src/gui/socialwindow.cpp:527
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
-msgid "Kick monster"
-msgstr "Monsters"
+msgid "Guild Name"
+msgstr "Guild"
 
-#: ../src/gui/popupmenu.cpp:141
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
-msgid "Kick player"
-msgstr "Kick gefaald!"
+msgid "Choose your guild's name."
+msgstr "Kies jouw server"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Kick succesvol!"
+#: src/gui/socialwindow.cpp:554
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: ../src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Groot"
+#: src/gui/socialwindow.cpp:559
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: ../src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
-msgid "Leave"
-msgstr "Groot"
+msgid "Accept Guild Invite"
+msgstr "Groepsuitnodiging aanvaarden"
+
+#: src/gui/socialwindow.cpp:576
+msgid "Received party request, but one already exists."
+msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: ../src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
-msgid "Leave Guild?"
-msgstr "Guild aanmaken"
+msgid "You have been invited you to join a party."
+msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: ../src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
-msgstr ""
+#: src/gui/socialwindow.cpp:589
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: ../src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Level: %d"
+#: src/gui/socialwindow.cpp:597
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/socialwindow.cpp:602
 #, c-format
-msgid "Level: %d"
-msgstr "Level: %d"
+msgid "%s has invited you to join the %s party."
+msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: ../src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
+#: src/gui/socialwindow.cpp:610
+msgid "Accept Party Invite"
+msgstr "Groepsuitnodiging aanvaarden"
 
-#: ../src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Kritieke aanval"
+#: src/gui/socialwindow.cpp:621
+msgid "Cannot create party. You are already in a party"
+msgstr ""
 
-#: ../src/gui/userpalette.cpp:107
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "Speler raakt Monster"
+msgid "Party Name"
+msgstr "Groep"
 
-#: ../src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
+#: src/gui/socialwindow.cpp:627
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Kies jouw server"
 
-#: ../src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
+msgid "Specials"
 msgstr ""
 
-#: ../src/client.cpp:682
-#, fuzzy
-msgid "Logging in"
-msgstr "Inloggen"
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
+#, c-format
+msgid "Level: %d"
+msgstr "Level: %d"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
-msgid "Login"
-msgstr "Inloggen"
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
+#, c-format
+msgid "Money: %s"
+msgstr "Geld: %s"
 
-#: ../src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#: src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "Leven:"
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr ""
+#: src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Ervaring:"
 
-#: ../src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Geluk"
+#: src/gui/statuswindow.cpp:130
+msgid "MP:"
+msgstr "Magie:"
 
-#: ../src/net/tmwa/generalhandler.cpp:106
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
-msgid "Luck %+d"
-msgstr "Geluk %+d"
+msgid "Job: %d"
+msgstr "Job: %d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Geluk:"
+#: src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Job:"
 
-#: ../src/gui/skilldialog.cpp:455
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Level: %d"
+msgid "Character points: %d"
+msgstr "Attributen van personage OK"
 
-#: ../src/gui/skilldialog.cpp:444
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Level: %d"
-
-#: ../src/net/tmwa/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Attack"
-msgstr "Magische Aanval:"
+msgid "Correction points: %d"
+msgstr "Vaardigheidspunten: %d"
 
-#: ../src/net/tmwa/generalhandler.cpp:227
-#, fuzzy
-msgid "M.Defense"
-msgstr "Magische Verdediging:"
+#: src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Handelen voorstellen"
 
-#: ../src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "Magie:"
+#: src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Bevestigd. Wachten..."
 
-#: ../src/resources/itemdb.cpp:56
-#, c-format
-msgid "MP %+d"
-msgstr "Magie %+d"
+#: src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Handel goedkeuren"
 
-#: ../src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "Magie:"
+#: src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Goedgekeurd. Wachten..."
 
-#: ../src/net/tmwa/chathandler.cpp:190
-#, fuzzy
-msgid "MVP player."
-msgstr "Speler"
+#: src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Handel: Jij"
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
-msgid "Male"
-msgstr "Mannelijk"
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Handel"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Map"
+#: src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Toevoegen"
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Naam: %s"
+msgid "You get %s"
+msgstr "Jij krijgt %s."
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Maximum"
+#: src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Je geeft:"
 
-#: ../src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Middelmatig"
+#: src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Veranderen"
 
-#: ../src/gui/socialwindow.cpp:157
-msgid "Member Invite to Guild"
+#: src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
+"het venster."
 
-#: ../src/gui/socialwindow.cpp:236
-#, fuzzy
-msgid "Member Invite to Party"
-msgstr "/party > Een gebruiker uitnodigen in de groep"
-
-#: ../src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Lid is succesvol gepromoveerd."
+#: src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "Je hebt niet genoeg geld."
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Bericht"
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Naam: %s"
 
-#: ../src/commandhandler.cpp:480
-msgid "Message closes chat."
-msgstr "Bericht sluit chat."
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Actualiseren..."
 
-#: ../src/commandhandler.cpp:493
-msgid "Message now closes chat."
-msgstr "Bericht sluit nu chat."
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Verbinden..."
 
-#: ../src/keyboardconfig.cpp:75
-msgid "Minimap Window"
-msgstr "Minimapvenster"
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Spelen"
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "Kaartje"
+#: src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1 Het updateproces is onvolledig."
 
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Missers"
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1 Het is ten sterkste aanbevolen dat"
 
-#: ../src/gui/statuswindow.cpp:224
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
-msgid "Money"
-msgstr "Geld: %d"
+msgid "##1  you try again later."
+msgstr "##1 je later opnieuw probeert"
 
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
-#, c-format
-msgid "Money: %s"
-msgstr "Geld: %s"
+#: src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Voltooid"
 
-#: ../src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Monster raakt Speler"
+#: src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Lijst van gebruikers in het huidig kanaal weergeven"
 
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Monsters"
+#: src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > stel het onderwerp van het huidig kanaal in"
 
-#: ../src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Omlaag"
+#: src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Verlaat een kanaal"
 
-#: ../src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Naar links"
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Maakt een gebruiker een kanaalbeheerder"
 
-#: ../src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Naar rechts"
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Verwijdert een gebruiker van het kanaal"
 
-#: ../src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Omhoog"
+#: src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Commando: /users"
 
-#: ../src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Muziek volume"
+#: src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Dit commando geeft de gebruikers in het kanaal weer."
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
-#, fuzzy, c-format
-msgid "Music: %s"
-msgstr "Onderwerp: %s"
+#: src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Commando: /topic <bericht>"
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Dit commando zet het onderwerp naar <bericht>."
 
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPCs"
+#: src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Commando: /quit"
 
-#: ../src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Naam"
+#: src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Dit commando verlaat het huidige kanaal."
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Naam:"
+#: src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr ""
+"Als je de laatste persoon in het kanaal bent, zal het kanaal worden "
+"verwijderd."
 
-#: ../src/gui/unregisterdialog.cpp:51
-#, c-format
-msgid "Name: %s"
-msgstr "Naam: %s"
+#: src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Commando: /op <nick>"
 
-#: ../src/gui/ministatus.cpp:157
-msgid "Need"
+#: src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Dit commando maakt van <nick> een kanaalbeheerder."
+
+#: src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
+"Kanaalbeheerders kunnen andere gebruikers uit het kanaal verwijderen en "
+"andere gebruikers kanaalbeheerders maken."
 
-#: ../src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Een gebruiker nodig om uit het kanaal te verwijderen!"
+#: src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Commando: /kick <nick>"
+
+#: src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Dit commando maakt <nick> het kanaal verlaten."
 
-#: ../src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr "Een gebruiker nodig om kanaalbeheerder te maken!"
 
-#: ../src/game.cpp:372
-msgid "Network Error"
-msgstr "Netwerkfout"
-
-#: ../src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutraal"
-
-#: ../src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Nieuw emailadres is incorrect"
-
-#: ../src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Nieuw wachtwoord is incorrect"
+#: src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Een gebruiker nodig om uit het kanaal te verwijderen!"
 
-#: ../src/net/tmwa/loginhandler.cpp:92
-#, fuzzy
-msgid "New password too short."
-msgstr "Nieuw wachtwoord is te kort"
+#: src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Globale aankondiging:"
 
-#: ../src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Volgende"
+#: src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Globale aankondiging van %s:"
 
-#: ../src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Volgende chattab"
+#: src/gui/widgets/chattab.cpp:153
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "%s fluistert: "
 
-#: ../src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Nee"
+#: src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Kan geen leeg chatbericht sturen!"
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
+#: src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
+#: src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Geen gameservers beschikbaar."
-
-#: ../src/net/tmwa/generalhandler.cpp:132
-#, fuzzy
-msgid "No servers available."
-msgstr "Geen servers beschikbaar"
+#: src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Sluit de fluistertab"
 
-#: ../src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Geen tekst"
+#: src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Commando: /close"
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is "
-"naar een beter plaats gegaan."
+#: src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Dit commando sluit de huidige fluistertab."
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
-msgid "None"
-msgstr "Nee"
+msgid "Command: /ignore"
+msgstr "Commando: /item"
 
-#: ../src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Momenteel niet aan het opnemen."
+#: src/gui/widgets/whispertab.cpp:90
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
-msgid "Not logged in."
-msgstr "Reeds aangemeld"
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Dit commando begint de chat log op te slaan naar het bestand <bestandsnaam>."
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Niets te verkopen."
+#: src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Status"
 
-#: ../src/gui/setup_audio.cpp:94
-#, fuzzy
-msgid "Notice"
-msgstr "Geen tekst"
+#: src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Sneltoets"
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
-msgid "OK"
-msgstr "OK"
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "OK selecteren"
 
-#: ../src/net/manaserv/loginhandler.cpp:152
+#: src/gui/worldselectdialog.cpp:76
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Oud emailadres is incorrect"
+msgid "Change Login"
+msgstr "Veranderen"
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
+#: src/gui/worldselectdialog.cpp:77
 #, fuzzy
-msgid "Old password incorrect."
-msgstr "Oud wachtwoord incorrect"
+msgid "Choose World"
+msgstr "Kies jouw server"
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr ""
+#: src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Omhoog"
 
-#: ../src/net/tmwa/gamehandler.cpp:87
-#, c-format
-msgid "Online users: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Omlaag"
 
-#: ../src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Naar links"
 
-#: ../src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Naar rechts"
 
-#: ../src/main.cpp:43
-msgid "Options:"
-msgstr "Opties:"
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Aanvallen"
 
-#: ../src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Speler raakt Monster"
+#: src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Viseren en Aanvallen"
 
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Namen van andere Spelers"
+#: src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Smilie"
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Spreken"
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr ""
+#: src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Aanval stoppen"
 
-#: ../src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:48
 #, fuzzy
-msgid "Outfits Window"
-msgstr "Statusvenster"
-
-#: ../src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr ""
+msgid "Target Monster"
+msgstr "Dichtstbijzijnde viseren"
 
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Eigen Naam"
+#: src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "NPC viseren"
 
-#: ../src/gui/setup_video.cpp:615
-#, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Deeltjes effecten instellingen gewijzigd."
+#: src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Speler viseren"
 
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Deeltjes effecten"
+#: src/keyboardconfig.cpp:51
+msgid "Pickup"
+msgstr "Oprapen"
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Deeltjes effecten"
+#: src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Vensters verbergen"
 
-#: ../src/gui/setup_video.cpp:263
-#, fuzzy
-msgid "Particle detail"
-msgstr "Deeltjes details"
+#: src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Zitten"
 
-#: ../src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Deeltjes details"
+#: src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Schermafdruk"
 
-#: ../src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Deeltjes effecten"
+#: src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Handelen inschakelen/uitschakelen"
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Groep"
+#: src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "Pad naar Muis vinden"
 
-#: ../src/gui/socialwindow.cpp:222
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
-msgid "Party %s quit requested."
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Groep"
-
-#: ../src/gui/socialwindow.cpp:629
-#, fuzzy
-msgid "Party Name"
-msgstr "Groep"
-
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Groepsnaam ontbreekt."
-
-#: ../src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Groep succesvol aangemaakt."
+msgid "Item Shortcut %d"
+msgstr "Snelkopeling naar voorwerp %d"
 
-#: ../src/gui/beingpopup.cpp:76
-#, fuzzy, c-format
-msgid "Party: %s"
-msgstr "Groep (%s)"
+#: src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Help venster"
 
-#: ../src/client.cpp:885
-#, fuzzy
-msgid "Password Change"
-msgstr "Wachtwoord:"
+#: src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Statusvenster"
 
-#: ../src/client.cpp:886
-msgid "Password changed successfully!"
+#: src/keyboardconfig.cpp:71
+msgid "Inventory Window"
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Wachtwoord:"
+#: src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Uitrustingsvenster"
 
-#: ../src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Wachtwoorden komen niet overeen."
+#: src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Vaardigheidsvenster"
 
-#: ../src/gui/popupmenu.cpp:188
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "Oprapen"
+#: src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Minimapvenster"
 
-#: ../src/keyboardconfig.cpp:52
-msgid "Pickup"
-msgstr "Oprapen"
+#: src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Gespreksvenster"
 
-#: ../src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "Notificatie bij opnemen"
+#: src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Voorwerpsnelkoppelingsvenster"
 
-#: ../src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Spelen"
+#: src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Instellingenvenster"
 
-#: ../src/commandhandler.cpp:545
-msgid "Player already ignored!"
-msgstr ""
+#: src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Debugvenster"
 
-#: ../src/commandhandler.cpp:554
+#: src/keyboardconfig.cpp:79
 #, fuzzy
-msgid "Player could not be ignored!"
-msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
+msgid "Social Window"
+msgstr "Vaardigheidsvenster"
 
-#: ../src/commandhandler.cpp:576
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
+#: src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Emoticonsnelkoppelingsvenster"
 
-#: ../src/net/manaserv/charhandler.cpp:193
+#: src/keyboardconfig.cpp:81
 #, fuzzy
-msgid "Player deleted."
-msgstr "Personage verwijderd."
+msgid "Outfits Window"
+msgstr "Statusvenster"
 
-#: ../src/commandhandler.cpp:574
-msgid "Player no longer ignored!"
+#: src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
 msgstr ""
 
-#: ../src/commandhandler.cpp:552
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "Groep succesvol aangemaakt."
-
-#: ../src/commandhandler.cpp:569
-msgid "Player wasn't ignored!"
+#: src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Spelers"
-
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Speler raakt Monster"
-
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Nog %d punten te verdelen"
-
-#: ../src/gui/charcreatedialog.cpp:256
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
-msgid "Please remove %d points"
-msgstr "Verwijder alstublieft %d punten"
+msgid "Emote Shortcut %d"
+msgstr "Emoticon snelkoppeling %d"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
-msgid "Please specify a name."
+#: src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Typ aub zowel het adres van de server, als de poort."
+#: src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Chat omhoogscrollen"
 
-#: ../src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Gif had geen effect..."
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Chat omlaagscrollen"
 
-#: ../src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Poort:"
+#: src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "Vorige chattab"
 
-#: ../src/gui/serverdialog.cpp:452
-msgid "Preparing download"
-msgstr ""
+#: src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Volgende chattab"
 
-#: ../src/gui/chat.cpp:307
-#, fuzzy, c-format
-msgid "Present: %s; %d players are present."
-msgstr "%d spelers zijn aanwezig."
+#: src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "OK selecteren"
 
-#: ../src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Druk op OK om te respawnen"
+#: src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Ingave 1 negeren"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Druk op de knop om het kalibreren te starten"
+#: src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Ingave 2 negeren"
 
-#: ../src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "Vorige chattab"
+#: src/keyboardconfig.cpp:183
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Los deze problemen op, of het spel kan raar gedrag vertonen."
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Prijs: %s / Totaal: %s"
+#: src/localplayer.cpp:985
+msgid "Unable to pick up item."
+msgstr "Kan het voorwerp niet oprapen."
 
-#: ../src/playerrelations.cpp:326
-msgid "Print '...'"
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:994
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Je raapte %s [@@%d|%s@@] op."
+msgstr[1] "Je raapte %s [@@%d|%s@@] op."
 
-#: ../src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Handelen voorstellen"
+#: src/main.cpp:42
+msgid "mana [options] [mana-file]"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Puls"
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
 msgstr ""
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Afsluiten"
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Regenboog"
+#: src/main.cpp:47
+msgid "Options:"
+msgstr "Opties:"
 
-#: ../src/gui/socialwindow.cpp:556
+#: src/main.cpp:48
 #, fuzzy
-msgid "Received guild request, but one already exists."
-msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version : Versie weergeven"
 
-#: ../src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
+#: src/main.cpp:49
+#, fuzzy
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help : Deze help weergeven"
 
-#: ../src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Opnemen..."
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : Gebruikte configuratiebestand"
 
-#: ../src/gui/setup_colors.cpp:108
+#: src/main.cpp:51
 #, fuzzy
-msgid "Red:"
-msgstr "Rood: "
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username : Login met deze gebruikersnaam"
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
-msgid "Register"
-msgstr "Aanmelden"
+#: src/main.cpp:52
+#, fuzzy
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password : Login met dit wachtwoord"
 
-#: ../src/gui/login.cpp:129
+#: src/main.cpp:53
 #, fuzzy
-msgid "Registration disabled"
-msgstr "Voorwerpdeling uitgeschakeld."
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character : Login met dit personage"
 
-#: ../src/net/tmwa/loginhandler.cpp:165
+#: src/main.cpp:54
 #, fuzzy
-msgid "Rejected from server."
-msgstr "Geweerd van server"
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server : Loginserver naam of IP-adres"
 
-#: ../src/gui/socialwindow.cpp:472
-#, fuzzy, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Uitnodiging van %s geweigerd."
+#: src/main.cpp:55
+#, fuzzy
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port : Loginserver poort"
 
-#: ../src/gui/socialwindow.cpp:453
-#, fuzzy, c-format
-msgid "Rejected party invite from %s."
-msgstr "Uitnodiging van %s geweigerd."
+#: src/main.cpp:56
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : Gebruik deze updatehost"
 
-#: ../src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Relatie"
+#: src/main.cpp:57
+#, fuzzy
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default : Kies standaard personageserver en personage"
 
-#: ../src/gui/login.cpp:60
+#: src/main.cpp:59
 #, fuzzy
-msgid "Remember username"
-msgstr "Onthoud Naam"
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Sla update downloads over"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Handel aanvragen"
+#: src/main.cpp:60
+#, fuzzy
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data : Map waarvan speldata geladen wordt"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/main.cpp:61
 #, fuzzy
-msgid "Request to quit denied!"
-msgstr "Handel aanvragen"
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir : Map te gebruiken als home"
 
-#: ../src/client.cpp:774
+#: src/main.cpp:62
 #, fuzzy
-msgid "Requesting characters"
-msgstr "Kies Personage"
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Gebruikte configuratiebestand"
 
-#: ../src/client.cpp:858
-msgid "Requesting registration details"
-msgstr ""
+#: src/main.cpp:63
+#, fuzzy
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir : Map te gebruiken als home"
 
-#: ../src/commandhandler.cpp:436
-#, c-format
-msgid "Requesting to join channel %s."
-msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
+#: src/main.cpp:65
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl : OpenGL uitschakelen voor deze sessie"
 
-#: ../src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Reset"
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Je bent dood."
 
-#: ../src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Vensters in beginstand"
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"We betreuren het om je te melden dat jouw personage is gestorven in een "
+"gevecht."
 
-#: ../src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr "De veranderingen worden pas actief na opnieuw opstarten"
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Je bent niet langer levend."
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "Herstart de client om de wijzigingen in werking te doen treden."
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "De koude handen van Pietje de Dood grijpen naar jouw ziel."
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Afhalen"
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Game Over!"
 
-#: ../src/commandhandler.cpp:489
-msgid "Return now toggles chat."
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
 msgstr ""
+"Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is "
+"naar een beter plaats gegaan."
 
-#: ../src/commandhandler.cpp:480
-msgid "Return toggles chat."
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
 msgstr ""
+"Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel "
+"te slaan is mislukt."
 
-#: ../src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Maak rondjes met de stick"
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Dit verliep niet zoals gepland."
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..."
 
-#: ../src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Opslaan van screenshot mislukt!"
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Verslagen"
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Je hebt het weer verknald, dump jouw lichaam  en ga er een nieuw halen."
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
+#: src/net/manaserv/beinghandler.cpp:323
 #, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Schermresolutie veranderd"
+msgid "Press OK to respawn."
+msgstr " Druk op OK om te respawnen"
 
-#: ../src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Schermafdruk"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Je stierf"
 
-#: ../src/game.cpp:333
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 #, fuzzy
-msgid "Screenshot saved as "
-msgstr "Screenshot opgeslagen naar ~/"
+msgid "Not logged in."
+msgstr "Reeds aangemeld"
 
-#: ../src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Chat omlaagscrollen"
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Chat omhoogscrollen"
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Gebruikersnaam bestaat al"
 
-#: ../src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "OK selecteren"
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
 
-#: ../src/gui/worldselectdialog.cpp:71
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
-msgid "Select World"
-msgstr "OK selecteren"
+msgid "Character's stats are too high."
+msgstr "Attributen van personage OK"
 
-#: ../src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Selecteer het aantal exemplaren om neer te leggen"
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Attributen van personage OK"
 
-#: ../src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
-msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: ../src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Onbekende foutmelding"
 
-#: ../src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
 
-#: ../src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Selecteer het aantal exemplaren om te verhandelen"
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Personage verwijderd."
 
-#: ../src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Verkopen"
-
-#: ../src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Verzenden"
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Onbekende foutmelding"
 
-#: ../src/gui/serverdialog.cpp:211
-#, fuzzy
-msgid "Server type:"
-msgstr "Server:"
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Geen gameservers beschikbaar."
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Server:"
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Onderwerp: %s"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Configureren"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Speler raakt Monster"
 
-#: ../src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Instellingenvenster"
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Commando: /join <kanaal>"
 
-#: ../src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Volume van geluiden"
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: ../src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Winkel"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#: ../src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Sneltoets"
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s heeft zich bij de groep gevoegd."
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
-msgid "Show IP: Off"
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
 msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
-msgid "Show IP: On"
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254
-#, fuzzy
-msgid "Show damage"
-msgstr "Naam tonen"
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:232
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
-msgid "Show gender"
-msgstr "Naam tonen"
+msgid "Unknown channel event."
+msgstr "Onbekend commando."
 
-#: ../src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show own name"
-msgstr "Naam tonen"
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Guild aangemaakt."
 
-#: ../src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
-msgstr "Notificatie bij oprapen weergeven"
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Fout bij het creëren van guild."
 
-#: ../src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "Zitten"
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Uitnodiging verzonden."
 
-#: ../src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Zitten niet mogelijk!"
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Lid is succesvol gepromoveerd."
 
-#: ../src/gui/skilldialog.cpp:362
-#, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Vaardigheden"
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Kon lid niet promoveren."
 
-#: ../src/gui/skilldialog.cpp:353
-#, fuzzy, c-format
-msgid "Skill Set %d"
-msgstr "Vaardigheidspunten: %d"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Verkeerd magie_teken"
 
-#: ../src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Vaardigheidsvenster"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Reeds aangemeld"
 
-#: ../src/gui/skilldialog.cpp:271
-#, fuzzy, c-format
-msgid "Skill points available: %d"
-msgstr "Vaardigheidspunten: %d"
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Account verlopen"
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Vaardigheden"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Nieuw wachtwoord is incorrect"
 
-#: ../src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr "Sloten:"
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Oud wachtwoord incorrect"
 
-#: ../src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Klein"
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Account niet verbonden. Log eerst in aub."
 
-#: ../src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Smilie"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Nieuw emailadres is incorrect"
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
-msgid "Social"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Oud emailadres is incorrect"
 
-#: ../src/keyboardconfig.cpp:80
+#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "Social Window"
-msgstr "Vaardigheidsvenster"
+msgid "The new email address already exists."
+msgstr "Het nieuwe emailadres bestaat al."
 
-#: ../src/gui/setup_video.cpp:582
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:136
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Iemand anders probeert deze account te gebruiken"
-
-#: ../src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Geluid"
-
-#: ../src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr ""
+msgid "Client version is too old."
+msgstr "Te oude Client versie"
 
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Account verlopen"
 
-#: ../src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Spectrum"
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Verkeerde gebruikersnaam, wachtwoord of emailadres"
 
-#: ../src/net/tmwa/generalhandler.cpp:142
+#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Speed hack detected."
-msgstr "Speedhack gedetecteerd"
+msgid "Username already exists."
+msgstr "Gebruikersnaam bestaat al"
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
-msgid "Split"
-msgstr "Splitsen"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "emailadres bestaat al"
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: ../src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Opname starten..."
-
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Statisch"
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Bijgevoegd bij groep."
 
-#: ../src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Status"
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s heeft zich bij de groep gevoegd."
 
-#: ../src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Statusvenster"
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s wees jouw uitnodiging af."
 
-#: ../src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Stoppen"
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Inkomende handelsaanvragen accepteren."
 
-#: ../src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Aanval stoppen"
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Inkomende handelsaanvragen negeren."
 
-#: ../src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Stoppen met opnemen"
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Handel aanvragen"
 
-#: ../src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Opslag"
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s wil met jou handelen, aanvaard je dit?"
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
-msgid "Store"
-msgstr "Opslaan"
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Handelen met %s"
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Kracht"
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Handel geannuleerd."
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Kracht %+d"
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Handel voltooid."
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Sterkte:"
+#: src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Kick gefaald!"
 
-#: ../src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Indienen"
+#: src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Kick succesvol!"
 
-#: ../src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr ""
+#: src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Niets te verkopen."
 
-#: ../src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Van personage wisselen"
+#: src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Bedankt voor de aankopen."
 
-#: ../src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Van server wisselen"
+#: src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Kan niets kopen."
 
-#: ../src/gui/setup_video.cpp:445
-#, fuzzy
-msgid "Switching to Full Screen"
-msgstr "Overgaan naar volledig scherm"
+#: src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Bedankt voor het verkopen."
 
-#: ../src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Spreken"
+#: src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Kan niets verkopen."
 
-#: ../src/gui/popupmenu.cpp:150
-#, c-format
-msgid "Talk to %s"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Viseren en Aanvallen"
+#: src/net/tmwa/charserverhandler.cpp:107
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Kan deze ID niet gebruiken"
 
-#: ../src/keyboardconfig.cpp:49
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Target Monster"
-msgstr "Dichtstbijzijnde viseren"
+msgid "Unknown char-server failure."
+msgstr "Onbekende foutmelding"
 
-#: ../src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "NPC viseren"
+#: src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
 
-#: ../src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Speler viseren"
+#: src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Personage verwijderd."
 
-#: ../src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Tekst"
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Kon personage niet verwijderen."
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Bedankt voor de aankopen."
+#: src/net/tmwa/charserverhandler.cpp:266
+msgid "Strength:"
+msgstr "Sterkte:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Bedankt voor het verkopen."
+#: src/net/tmwa/charserverhandler.cpp:267
+msgid "Agility:"
+msgstr "Agiliteit:"
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "De koude handen van Pietje de Dood grijpen naar jouw ziel."
+#: src/net/tmwa/charserverhandler.cpp:268
+msgid "Vitality:"
+msgstr "Vitaliteit:"
 
-#: ../src/game.cpp:368
-#, fuzzy
-msgid "The connection to the server was lost."
-msgstr ""
-"De verbinding met de server is verloren gegaan, het programma zal nu "
-"afsluiten"
+#: src/net/tmwa/charserverhandler.cpp:269
+msgid "Intelligence:"
+msgstr "Intelligentie:"
 
-#: ../src/gui/changeemaildialog.cpp:141
-#, fuzzy
-msgid "The email address entries mismatch."
-msgstr "Het nieuwe emailadres bestaat al."
+#: src/net/tmwa/charserverhandler.cpp:270
+msgid "Dexterity:"
+msgstr "Dexteriteit:"
 
-#: ../src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "Het nieuwe emailadres bestaat al."
+#: src/net/tmwa/charserverhandler.cpp:271
+msgid "Luck:"
+msgstr "Geluk:"
 
-#: ../src/gui/changeemaildialog.cpp:127
+#: src/net/tmwa/chathandler.cpp:87
 #, fuzzy, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Fluisterbericht kon niet verzonden worden, gebruiker is offline."
 
-#: ../src/gui/changeemaildialog.cpp:134
+#: src/net/tmwa/chathandler.cpp:96
 #, fuzzy, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: ../src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
+#: src/net/tmwa/chathandler.cpp:230
+#, fuzzy
+msgid "MVP player."
+msgstr "Speler"
+
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Kanalen worden niet ondersteund!"
+
+#: src/net/tmwa/gamehandler.cpp:88
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Game"
+msgstr "Naam"
 
-#: ../src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Handel aanvragen"
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
+msgid "Strength %+d"
+msgstr "Kracht %+d"
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
+msgid "Agility %+d"
+msgstr "Behandigheid %+d"
 
-#: ../src/gui/register.cpp:166
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
+msgid "Vitality %+d"
+msgstr "Vitaliteit %+d"
 
-#: ../src/gui/register.cpp:174
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
-
-#: ../src/net/tmwa/generalhandler.cpp:139
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "Deze account is reeds aangemeld"
+msgid "Intelligence %+d"
+msgstr "Intelligentie %+d"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
+#: src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Vaardigheid %+d"
 
-#: ../src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
+msgstr "Geluk %+d"
 
-#: ../src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "Dit commando wijzigt het ervaringsdelingsbeleid van de groep."
+#: src/net/tmwa/generalhandler.cpp:132
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Authenticatie mislukt"
 
-#: ../src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr "Dit commando wijzigt het voorwerpdelingsbeleid van de groep."
+#: src/net/tmwa/generalhandler.cpp:135
+#, fuzzy
+msgid "No servers available."
+msgstr "Geen servers beschikbaar"
 
-#: ../src/commandhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Dit commando zet het onderwerp naar <bericht>."
+msgid "Someone else is trying to use this account."
+msgstr "Iemand anders probeert deze account te gebruiken"
 
-#: ../src/commandhandler.cpp:229
-msgid "This command clears the chat log of previous chat."
-msgstr "Dit commando maakt de chatlog van vorige chatsessies leeg"
+#: src/net/tmwa/generalhandler.cpp:142
+#, fuzzy
+msgid "This account is already logged in."
+msgstr "Deze account is reeds aangemeld"
 
-#: ../src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "Dit commando sluit de huidige fluistertab."
+#: src/net/tmwa/generalhandler.cpp:145
+#, fuzzy
+msgid "Speed hack detected."
+msgstr "Speedhack gedetecteerd"
 
-#: ../src/commandhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Dit commando creëert een nieuwe groep genaamd <groepsnaam>"
+msgid "Duplicated login."
+msgstr "Dubbele login"
 
-#: ../src/commandhandler.cpp:210
-msgid "This command displays a list of all commands available."
-msgstr "Dit commando geeft een lijst weer van alle mogelijke commando's"
+#: src/net/tmwa/generalhandler.cpp:151
+#, fuzzy
+msgid "Unknown connection error."
+msgstr "Onbekenden connectiefout"
 
-#: ../src/commandhandler.cpp:213
-msgid "This command displays help on <command>."
-msgstr "Dit commando geeft help weer van <commando>"
+#: src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "De verbinding met de server werd verbroken!"
 
-#: ../src/commandhandler.cpp:324
-msgid "This command displays the name of the current map."
-msgstr "Dit commando geeft de naam weer van de huidige map."
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Kracht"
 
-#: ../src/commandhandler.cpp:329
-msgid "This command displays the number of players currently online."
-msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Behendigheid"
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr ""
-"Dit commando geeft het huidige ervaringsdelingbeleid van de groep weer."
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Vitaliteit"
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr ""
-"Dit commando geeft het huidige voorwerpdelingsbeleid van de groep weer."
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Intelligentie"
 
-#: ../src/commandhandler.cpp:313
-msgid "This command displays the return toggle status."
-msgstr ""
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Vaardigheid"
 
-#: ../src/commandhandler.cpp:302
-msgid "This command finishes a recording session."
-msgstr "Dit commando beëindigt het opslaan van de chatlog."
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Geluk"
 
-#: ../src/commandhandler.cpp:292
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"Dit commando haalt een lijst op van spelers die je kunnen horen en zendt dit "
-"naar ofwel het logboek als dit opgeslagen wordt, of anders naar de chatlog."
+#: src/net/tmwa/generalhandler.cpp:238
+#, fuzzy
+msgid "Defense"
+msgstr "Verdediging:"
 
-#: ../src/commandhandler.cpp:234
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
+msgid "M.Attack"
+msgstr "Magische Aanval:"
 
-#: ../src/gui/widgets/whispertab.cpp:89
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
+msgid "M.Defense"
+msgstr "Magische Verdediging:"
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
+#: src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Nauwkeurigheid:"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
+#: src/net/tmwa/generalhandler.cpp:242
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% Ontwijking:"
 
-#: ../src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Dit commando verlaat het huidige kanaal."
+#: src/net/tmwa/generalhandler.cpp:243
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "Kritieke aanval"
 
-#: ../src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Dit commando maakt van <nick> een kanaalbeheerder."
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Guild"
 
-#: ../src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Dit commando maakt <nick> het kanaal verlaten."
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Geeft deze help weer."
 
-#: ../src/commandhandler.cpp:240
-msgid "This command makes you enter <channel>."
-msgstr "Dit commando voegt je toe op kanaal <kanaal>."
+#: src/net/tmwa/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Nodig een speler uit voor jouw groep"
 
-#: ../src/commandhandler.cpp:223
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Dit commando stuurt het bericht <msg> naar alle spelers momenteel online."
+#: src/net/tmwa/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Verlaat de groep waarin je je bevindt"
 
-#: ../src/commandhandler.cpp:258
-msgid "This command sends the text <message> to <nick>."
-msgstr "Dit commando zendt de tekst <bericht> aan <nick>."
+#: src/net/tmwa/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Verwijder iemand vanuit de groep waarin je bent"
 
-#: ../src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Dit commando zet het onderwerp naar <bericht>."
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Commando: /invite <nick>"
 
-#: ../src/commandhandler.cpp:307
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
+#: src/net/tmwa/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
 
-#: ../src/commandhandler.cpp:246
-msgid "This command shows a list of all channels."
-msgstr "Dit commando geeft een lijst weer van alle kanalen."
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Commando: /leave"
 
-#: ../src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Dit commando geeft de gebruikers in het kanaal weer."
+#: src/net/tmwa/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
 
-#: ../src/commandhandler.cpp:299
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr ""
-"Dit commando begint de chat log op te slaan naar het bestand <bestandsnaam>."
+#: src/net/tmwa/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Groepsnaam ontbreekt."
 
-#: ../src/commandhandler.cpp:318
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:95
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
 msgstr ""
-"Dit commando begint de chat log op te slaan naar het bestand <bestandsnaam>."
 
-#: ../src/commandhandler.cpp:251
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Dit commando vertelt anderen dat je <msg> bent/doet."
+#: src/net/tmwa/guildhandler.cpp:306
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s is nu een lid van jouw groep."
 
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
+#: src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
 msgstr ""
 
-#: ../src/commandhandler.cpp:266
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/net/tmwa/guildhandler.cpp:316
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Onbekend uitnodigingsantwoord van %s."
+
+#: src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
 msgstr ""
-"Dit commando probeert een tabblad aan te maken voor alle whispers tussen jou "
-"en <nick>"
 
-#: ../src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "Dit is hoe de kleur eruit ziet"
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Groep"
 
-#: ../src/net/tmwa/loginhandler.cpp:179
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "Deze gebruikersnaam bestaat al"
+#: src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Nodig een speler uit voor jouw groep"
 
-#: ../src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Klein"
+#: src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Verlaat de groep waarin je je bevindt"
 
-#: ../src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "Aan:"
+#: src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Verwijder iemand vanuit de groep waarin je bent"
 
-#: ../src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr ""
+#: src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Geeft weer/wijzigt de opties voor voorwerpdeling"
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Onderwerp: %s"
+#: src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Geeft weer/wijzigt de ervaringsdelingsopties"
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Handel"
+#: src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
 
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Handel geannuleerd."
+#: src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Commando: /item <beleid>"
 
-#: ../src/net/tmwa/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Handel onderbroken vanwege een onbekende reden."
+#: src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr "Dit commando wijzigt het voorwerpdelingsbeleid van de groep."
 
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Handel voltooid."
+#: src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<beleid> kan een van de volgende zijn om voorwerpdeling in te schakelen: "
+"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", \"no"
+"\", \"false\"."
 
-#: ../src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Handel mislukte!"
+#: src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Commando: /item"
 
-#: ../src/net/tmwa/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Handel met %s geannuleerd."
+#: src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+"Dit commando geeft het huidige voorwerpdelingsbeleid van de groep weer."
 
-#: ../src/gui/popupmenu.cpp:83
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "Handelen met %s"
+#: src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Commando: /exp <beleid>"
 
-#: ../src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Handel: Jij"
+#: src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr "Dit commando wijzigt het ervaringsdelingsbeleid van de groep."
 
-#: ../src/net/tmwa/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Handelen: Jij en %s"
+#: src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<beleid> kan een van de volgende zijn om ervaringsdeling in te schakelen: "
+"\"1\", \"true\", \"yes\". Of om ervaringsdeling uit te schakelen: \"0\", "
+"\"false\", \"no\"."
 
-#: ../src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Handelen is niet mogelijk. Personage bestaat niet."
+#: src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Commando: /exp"
 
-#: ../src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Handelen is niet mogelijk. Partner is te ver weg."
+#: src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+"Dit commando geeft het huidige ervaringsdelingbeleid van de groep weer."
 
-#: ../src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Handelen met %s"
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Voorwerpdeling ingeschakeld."
 
-#: ../src/gui/setup_video.cpp:477
-#, fuzzy
-msgid "Transparency disabled"
-msgstr "Ervaringsdeling uitgeschakeld."
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Voorwerpdeling uitgeschakeld."
 
-#: ../src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
-msgstr ""
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "Voorwerpdeling is niet mogelijk."
 
-#: ../src/localplayer.cpp:1251
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
-msgid "Tried to pick up nonexistent item."
-msgstr "Kan het voorwerp niet oprapen."
+msgid "Item sharing unknown."
+msgstr "Voorwerpdeling ingeschakeld."
 
-#: ../src/commandhandler.cpp:335
-msgid "Type /help for a list of commands."
-msgstr "Type /help voor een lijst van commando's."
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Ervaringsdeling ingeschakeld."
 
-#: ../src/gui/changeemaildialog.cpp:51
-#, fuzzy
-msgid "Type new email address twice:"
-msgstr "Typ nieuw emailadres tweemaal:"
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr "Ervaringsdeling uitgeschakeld."
 
-#: ../src/gui/changepassworddialog.cpp:63
-#, fuzzy
-msgid "Type new password twice:"
-msgstr "Typ nieuw wachtwoord tweemaal:"
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "Ervaringsdeling is niet mogelijk."
 
-#: ../src/gui/setup_colors.cpp:71
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
-msgid "Type:"
-msgstr "Type: "
+msgid "Experience sharing unknown."
+msgstr "Ervaringsdeling ingeschakeld."
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Kan niets kopen."
+#: src/net/tmwa/inventoryhandler.cpp:285
+msgid "Failed to use item."
+msgstr "Kan voorwerp niet gebruiken."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Kan dit niet uitrusten."
 
-#: ../src/net/tmwa/network.cpp:345
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Kan niets verkopen."
-
-#: ../src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Kan niets verkopen."
-
-#: ../src/net/tmwa/inventoryhandler.cpp:418
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:90
-#, fuzzy
-msgid "Unassign"
-msgstr "Toewijzen"
-
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
-msgid "Unequip"
-msgstr "Afdoen"
-
-#: ../src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "Afdoen"
-
-#: ../src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "Onbehandelde handelannulatiepakket."
-
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr ""
+#: src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
 
-#: ../src/net/net.cpp:145
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Onbekend type voorwerp"
+msgid "New password too short."
+msgstr "Nieuw wachtwoord is te kort"
 
-#: ../src/net/manaserv/chathandler.cpp:327
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
-msgid "Unknown channel event."
-msgstr "Onbekend commando."
+msgid "Unregistered ID."
+msgstr "Ongeregistreerde ID"
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Onbekende foutmelding"
-
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
-msgid "Unknown command."
-msgstr "Onbekend commando."
+msgid "Wrong password."
+msgstr "Onjuist wachtwoord"
 
-#: ../src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
-msgid "Unknown connection error."
-msgstr "Onbekenden connectiefout"
-
-#: ../src/net/manaserv/charhandler.cpp:208
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Onbekende foutmelding"
+msgid "Account expired."
+msgstr "Account verlopen"
 
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
-msgid "Unknown error."
-msgstr "Onbekende foutmelding"
+msgid "Rejected from server."
+msgstr "Geweerd van server"
 
-#: ../src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
-msgid "Unknown guild invite response."
-msgstr "Onbekend uitnodigingsantwoord van %s."
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"Je bent permanent geband van het spel. Neem aub contact op met het GM team."
 
-#: ../src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
-msgid "Unknown invite response for %s."
-msgstr "Onbekend uitnodigingsantwoord van %s."
-
-#: ../src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Onbekend voorwerp"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Je bent tijdelijk geband van het spel tot %s.\n"
+"Neem aub contact op met het GM team via de forums."
 
-#: ../src/localplayer.cpp:1258
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
-msgid "Unknown problem picking up item."
-msgstr "Kan het voorwerp niet oprapen."
-
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Registreren"
+msgid "This user name is already taken."
+msgstr "Deze gebruikersnaam bestaat al"
 
-#: ../src/client.cpp:926
-#, fuzzy
-msgid "Unregister Successful"
-msgstr "Registreren"
+#: src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:156
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
-msgid "Unregistered ID."
-msgstr "Ongeregistreerde ID"
-
-#: ../src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Omhoog"
-
-#: ../src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Actualiseren..."
-
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
-msgid "Use"
-msgstr "Gebruiken"
+msgid "Unable to resolve host \""
+msgstr "Kan niets verkopen."
 
-#: ../src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
-msgid "User is now part of your guild."
-msgstr "%s is nu een lid van jouw groep."
-
-#: ../src/net/tmwa/guildhandler.cpp:300
-msgid "User rejected guild invite."
-msgstr ""
+msgid "Connection to server terminated. "
+msgstr "Verbinden met de map server..."
 
-#: ../src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Gebruikersnaam bestaat al"
+#: src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Kan geen groep aanmaken."
 
-#: ../src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Video"
+#: src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Groep succesvol aangemaakt."
 
-#: ../src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Zichtbare namen"
+#: src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s is al een lid van een groep."
 
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Vitaliteit"
+#: src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s wees jouw uitnodiging af."
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
-msgid "Vitality %+d"
-msgstr "Vitaliteit %+d"
+msgid "%s is now a member of your party."
+msgstr "%s is nu een lid van jouw groep."
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Vitaliteit:"
+#: src/net/tmwa/partyhandler.cpp:131
+#, c-format
+msgid "Unknown invite response for %s."
+msgstr "Onbekend uitnodigingsantwoord van %s."
 
-#: ../src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "Wachten op server"
+#: src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Je hebt de groep verlaten."
 
-#: ../src/gui/serverdialog.cpp:448
-#, fuzzy
-msgid "Waiting for server..."
-msgstr "Wachten op server"
+#: src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s heeft jouw groep verlaten."
 
-#: ../src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "Warp mislukt..."
+#: src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Een onbekend lid probeerde te zeggen: %s"
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
-"We betreuren het om je te melden dat jouw personage is gestorven in een "
-"gevecht."
 
-#: ../src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Gewicht:"
+#: src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s is niet in jouw groep!"
 
-#: ../src/gui/itempopup.cpp:126
-#, fuzzy, c-format
-msgid "Weight: %s"
-msgstr "Gewicht "
+#: src/net/tmwa/playerhandler.cpp:100
+msgid "Insert coin to continue."
+msgstr "Werp een muntstuk in om verder te spelen."
 
-#: ../src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "Tijdens negeren:"
+#: src/net/tmwa/playerhandler.cpp:118
+msgid "You're not dead yet. You're just resting."
+msgstr "Je bent nog niet dood. Je bent maar aan het rusten."
 
-#: ../src/gui/popupmenu.cpp:91
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "Fluister"
+#: src/net/tmwa/playerhandler.cpp:119
+msgid "You are no more."
+msgstr "Je bent niet langer."
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
+#: src/net/tmwa/playerhandler.cpp:120
+msgid "You have ceased to be."
+msgstr "Je hebt opgehouden te zijn."
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "Fluisterbericht kon niet verzonden worden, gebruiker is offline."
+#: src/net/tmwa/playerhandler.cpp:121
+msgid "You've expired and gone to meet your maker."
+msgstr "Je bent verlopen en gaat een bezoekje maken bij jouw schepper."
 
-#: ../src/gui/chat.cpp:452
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Fluisteren naar %s: %s"
+#: src/net/tmwa/playerhandler.cpp:122
+msgid "You're a stiff."
+msgstr "Je bent stokstijf."
 
-#: ../src/gui/socialwindow.cpp:158
-#, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:123
+msgid "Bereft of life, you rest in peace."
+msgstr "Beroofd van het leven, rust je in vrede."
 
-#: ../src/gui/socialwindow.cpp:237
-#, c-format
-msgid "Who would you like to invite to party %s?"
+#: src/net/tmwa/playerhandler.cpp:124
+msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Wilskracht:"
-
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "Wilskracht %+d"
-
-#: ../src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Verkeerd magie_teken"
-
-#: ../src/net/tmwa/loginhandler.cpp:159
-#, fuzzy
-msgid "Wrong password."
-msgstr "Onjuist wachtwoord"
-
-#: ../src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Verkeerde gebruikersnaam of wachtwoord"
+#: src/net/tmwa/playerhandler.cpp:125
+msgid "Your metabolic processes are now history."
+msgstr "Jouw metabolische processen behoren nu tot het verleden."
 
-#: ../src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Verkeerde gebruikersnaam, wachtwoord of emailadres"
+#: src/net/tmwa/playerhandler.cpp:126
+msgid "You're off the twig."
+msgstr ""
 
-#: ../src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Ja"
+#: src/net/tmwa/playerhandler.cpp:127
+msgid "You've kicked the bucket."
+msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Je stierf"
+#: src/net/tmwa/playerhandler.cpp:128
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Je bent een ex-speler."
 
-#: ../src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:131
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
+msgid "Message"
+msgstr "Bericht"
+
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
 "herstellen."
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Je bent dood."
-
-#: ../src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Je bent niet langer."
-
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Je bent niet langer levend."
+#: src/net/tmwa/playerhandler.cpp:313
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Je raapte op: "
 
-#: ../src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
+#: src/net/tmwa/playerhandler.cpp:348
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "Je kan dat nu niet doen!"
-
-#: ../src/net/tmwa/specialhandler.cpp:189
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
+#: src/net/tmwa/playerhandler.cpp:488
+msgid "Equip arrows first."
+msgstr ""
 
-#: ../src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "Je hebt niet genoeg geld."
+#: src/net/tmwa/specialhandler.cpp:144
+msgid "Trade failed!"
+msgstr "Handel mislukte!"
 
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
-#, fuzzy, c-format
-msgid "You get %s"
-msgstr "Jij krijgt %s."
+#: src/net/tmwa/specialhandler.cpp:147
+msgid "Emote failed!"
+msgstr "Emoticon gefaald!"
 
-#: ../src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "Je geeft:"
+#: src/net/tmwa/specialhandler.cpp:150
+msgid "Sit failed!"
+msgstr "Zitten niet mogelijk!"
 
-#: ../src/gui/socialwindow.cpp:592
-#, fuzzy, c-format
-msgid "You have been invited to join the %s party."
-msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
+#: src/net/tmwa/specialhandler.cpp:153
+msgid "Chat creating failed!"
+msgstr "Chatcreatie mislukte!"
 
-#: ../src/gui/socialwindow.cpp:588
-#, fuzzy
-msgid "You have been invited you to join a party."
-msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
+#: src/net/tmwa/specialhandler.cpp:156
+msgid "Could not join party!"
+msgstr "Kan je niet bij de groep voegen!"
 
-#: ../src/net/tmwa/loginhandler.cpp:168
-#, fuzzy
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Je bent permanent geband van het spel. Neem aub contact op met het GM team."
+#: src/net/tmwa/specialhandler.cpp:159
+msgid "Cannot shout!"
+msgstr "Kan niet roepen!"
 
-#: ../src/net/tmwa/loginhandler.cpp:172
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
-msgstr ""
-"Je bent tijdelijk geband van het spel tot %s.\n"
-"Neem aub contact op met het GM team via de forums."
+#: src/net/tmwa/specialhandler.cpp:168
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Je hebt nog geen hoog genoeg level bereikt!"
 
-#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Je hebt opgehouden te zijn."
+#: src/net/tmwa/specialhandler.cpp:171
+msgid "Insufficient HP!"
+msgstr "Onvoldoende leven!"
 
-#: ../src/net/tmwa/partyhandler.cpp:241
-msgid "You have left the party."
-msgstr "Je hebt de groep verlaten."
+#: src/net/tmwa/specialhandler.cpp:174
+msgid "Insufficient SP!"
+msgstr "Onvoldoende Vaardigheidspunten!"
 
-#: ../src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Je hebt geen memo's!"
 
-#: ../src/net/tmwa/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Je hebt nog geen hoog genoeg level bereikt!"
-
-#: ../src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:180
+msgid "You cannot do that right now!"
+msgstr "Je kan dat nu niet doen!"
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:183
+msgid "Seems you need more money... ;-)"
+msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
 
-#: ../src/net/tmwa/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "Je hebt een andere blauwe edelsteen nodig!"
+#: src/net/tmwa/specialhandler.cpp:186
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
 
-#: ../src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Je hebt een andere rode edelsteen nodig!"
 
-#: ../src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
-msgstr ""
-
-#: ../src/localplayer.cpp:1276
-#, fuzzy, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Je raapte %s [@@%d|%s@@] op."
-msgstr[1] "Je raapte %s [@@%d|%s@@] op."
-
-#: ../src/net/tmwa/playerhandler.cpp:344
-#, fuzzy, c-format
-msgid "You picked up %s."
-msgstr "Je raapte op: "
-
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Je hebt het weer verknald, dump jouw lichaam  en ga er een nieuw halen."
-
-#: ../src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: ../src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "Je bent stokstijf."
+#: src/net/tmwa/specialhandler.cpp:192
+msgid "You need another blue gem!"
+msgstr "Je hebt een andere blauwe edelsteen nodig!"
 
-#: ../src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
-#: ../src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "Je bent nog niet dood. Je bent maar aan het rusten."
+#: src/net/tmwa/specialhandler.cpp:198
+msgid "Huh? What's that?"
+msgstr "Huh? Wat is dat?"
 
-#: ../src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:207
+msgid "Warp failed..."
+msgstr "Warp mislukt..."
 
-#: ../src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:210
+msgid "Could not steal anything..."
+msgstr "Kon niets stelen..."
 
-#: ../src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "Je bent verlopen en gaat een bezoekje maken bij jouw schepper."
+#: src/net/tmwa/specialhandler.cpp:213
+msgid "Poison had no effect..."
+msgstr "Gif had geen effect..."
 
-#: ../src/net/tmwa/playerhandler.cpp:136
-msgid "You've kicked the bucket."
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Handelen is niet mogelijk. Partner is te ver weg."
 
-#: ../src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Handelen is niet mogelijk. Personage bestaat niet."
 
-#: ../src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Handel onderbroken vanwege een onbekende reden."
 
-#: ../src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "Jouw metabolische processen behoren nu tot het verleden."
+#: src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Handelen: Jij en %s"
 
-#: ../src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Je naam moet uit tenminste 4 tekens bestaan"
+#: src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel met %s geannuleerd."
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel "
-"te slaan is mislukt."
+#: src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr "Onbehandelde handelannulatiepakket."
 
-#: ../src/gui/setup_video.cpp:233
-msgid "as particle"
-msgstr "als deeltje"
+#: src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen."
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "hoog"
+#: src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
 
-#: ../src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "in chat"
+#: src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "laag"
+#: src/playerrelations.cpp:310
+#, fuzzy
+msgid "Completely ignore"
+msgstr "Voltooid"
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "max"
+#: src/playerrelations.cpp:340
+msgid "Blink name"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "gemiddeld"
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "Aanval %+d"
 
-#: ../src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "uit"
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "Verdediging %+d"
 
-#: ../src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr ""
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "Leven %+d"
 
-#: ../src/gui/serverdialog.cpp:558
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "requires v%s"
-msgstr ""
+msgid "MP %+d"
+msgstr "Magie %+d"
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Onbekend voorwerp"
+
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr "naamloos"
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " kan niet gecreëerd worden, maar het bestaat niet! Verlaten."
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "Leven:"
 
-#~ msgid " host: "
-#~ msgstr " host: "
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "Magie:"
 
-#~ msgid " video mode: "
-#~ msgstr " video modus: "
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Ervaring:"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Reflex:"
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Geld: %d"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Zelfde functie als create"
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Job:"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 Levensbalk"
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Level: %d"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 Levensbalk"
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "Toegang geweigerd"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 Levensbalk"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Onbekende fout bij het selecteren van personage"
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|%s aanvallen@@"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Op deze manier iemand uitnodigen wordt momenteel niet ondersteund."
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Annuleren@@"
+#~ msgid "Willpower:"
+#~ msgstr "Wilskracht:"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Neerleggen@@"
+#~ msgid "Willpower %+d"
+#~ msgstr "Wilskracht %+d"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|%s oppakken@@"
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Wilskracht:"
 
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Handelen met %s@@"
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "Server is volzet"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Uitrusten@@"
+#~ msgid "Text Shadow"
+#~ msgstr "Tekstschaduw"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Gebruiken@@"
+#~ msgid "Text Outline"
+#~ msgstr "Tekstuitlijning"
 
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Toegang geweigerd"
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Vooruitgangsbalk Labels"
 
-#~ msgid "Ammo"
-#~ msgstr "Ammunitie"
+#~ msgid "Background"
+#~ msgstr "Achtergrond"
 
-#~ msgid "Arms"
-#~ msgstr "Wapens"
+#~ msgid "Highlight"
+#~ msgstr "Accentueren"
 
-#~ msgid "Attack:"
-#~ msgstr "Aanval:"
+#~ msgid "Tab Highlight"
+#~ msgstr "Tab Accentuering"
 
-#~ msgid "Axe"
-#~ msgstr "Bijl"
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Voorwerp te duur"
 
-#~ msgid "Background"
-#~ msgstr "Achtergrond"
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Voorwerp wordt al gedragen"
 
-#~ msgid "Bow"
-#~ msgstr "Boog"
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#~ msgid "Buddy"
-#~ msgstr "Vriend"
+#~ msgid "Player"
+#~ msgstr "Speler"
 
-#~ msgid "Buddy List"
-#~ msgstr "Vriendenlijst"
+#~ msgid "Whisper"
+#~ msgstr "Fluister"
 
-#~ msgid "Buddys"
-#~ msgstr "Vrienden"
+#~ msgid "Is"
+#~ msgstr "is gelijk aan"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Commando: /new <groepsnaam>"
+#~ msgid "Server"
+#~ msgstr "Server"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Verbinden met de account server..."
+#~ msgid "Hyperlink"
+#~ msgstr "Hyperlink"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Verbinden met de karakter server..."
+#~ msgid "Being"
+#~ msgstr "Wezen"
 
-#~ msgid "Cost"
-#~ msgstr "Kosten"
+#~ msgid "Other Players' Names"
+#~ msgstr "Namen van andere Spelers"
 
-#~ msgid "Couldn't set "
-#~ msgstr "Kan niet instellen van "
+#~ msgid "Own Name"
+#~ msgstr "Eigen Naam"
 
-#~ msgid "Description: %s"
-#~ msgstr "Beschrijving: %s"
+#~ msgid "GM Names"
+#~ msgstr "GM Namen"
 
-#~ msgid "Effect: %s"
-#~ msgstr "Effect: %s"
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Kan niet wisselen naar "
+#~ msgid "Monsters"
+#~ msgstr "Monsters"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Onbekend type voorwerp"
 
 #~ msgid "Generics"
 #~ msgstr "Generiek"
 
-#~ msgid "Guilds"
-#~ msgstr "Guilds"
-
-#~ msgid "HP Bar"
-#~ msgstr "Levensbalk"
-
 #~ msgid "Hats"
 #~ msgstr "Hoeden"
 
-#~ msgid "Highlight"
-#~ msgstr "Accentueren"
+#~ msgid "Usables"
+#~ msgstr "Gebruiksvoorwerpen"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Hyperlink"
+#~ msgid "Shirts"
+#~ msgstr "Shirts"
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Op deze manier iemand uitnodigen wordt momenteel niet ondersteund."
+#~ msgid "Pants"
+#~ msgstr "Broeken"
 
-#~ msgid "Is"
-#~ msgstr "is gelijk aan"
+#~ msgid "Shoes"
+#~ msgstr "Schoenen"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Voorwerp wordt al gedragen"
+#~ msgid "Shields"
+#~ msgstr "Schilden"
+
+#~ msgid "Rings"
+#~ msgstr "Ringen"
+
+#~ msgid "Necklaces"
+#~ msgstr "Kettingen"
+
+#~ msgid "Arms"
+#~ msgstr "Wapens"
+
+#~ msgid "Ammo"
+#~ msgstr "Ammunitie"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Deeltjes effecten"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Notificatie bij opnemen"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Ervaring Notificatie"
 
 #, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Voorwerp te duur"
+#~ msgid "Player Hits Monster"
+#~ msgstr "Speler raakt Monster"
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Beroep niveau: %d"
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monster raakt Speler"
 
-#~ msgid "Knife"
-#~ msgstr "Mes"
+#~ msgid "Critical Hit"
+#~ msgstr "Kritieke aanval"
 
-#~ msgid "Mace"
-#~ msgstr "Goedendag"
+#~ msgid "Misses"
+#~ msgstr "Missers"
 
-#~ msgid "Magic"
-#~ msgstr "Magie"
+#~ msgid "HP Bar"
+#~ msgstr "Levensbalk"
 
-#~ msgid "Max level"
-#~ msgstr "Maximum level"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 Levensbalk"
 
-#~ msgid "Necklaces"
-#~ msgstr "Kettingen"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 Levensbalk"
 
-#~ msgid "New"
-#~ msgstr "Nieuw"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 Levensbalk"
 
-#~ msgid "Ok"
-#~ msgstr "OK"
+#~ msgid "no"
+#~ msgstr "nee"
 
-#~ msgid "Pants"
-#~ msgstr "Broeken"
+#~ msgid "Buddy"
+#~ msgstr "Vriend"
 
-#~ msgid "Party Window"
-#~ msgstr "Groepsvenster"
+#~ msgid "Buddy List"
+#~ msgstr "Vriendenlijst"
 
-#~ msgid "Player"
-#~ msgstr "Speler"
+#~ msgid "Description: %s"
+#~ msgstr "Beschrijving: %s"
 
-#~ msgid "Present: "
-#~ msgstr "Aanwezig: "
+#~ msgid "Effect: %s"
+#~ msgstr "Effect: %s"
 
 #~ msgid "Previous"
 #~ msgstr "Vorige"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Vooruitgangsbalk Labels"
+#~ msgid "New"
+#~ msgstr "Nieuw"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "Beroep niveau: %d"
+
+#~ msgid "Present: "
+#~ msgstr "Aanwezig: "
 
 #~ msgid "Quit Guild"
 #~ msgstr "Guild verlaten"
 
+#~ msgid "Ok"
+#~ msgstr "OK"
+
 #~ msgid "Recent:"
 #~ msgstr "Recent:"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Overblijvende statuspunten: %d"
+#~ msgid "Magic"
+#~ msgstr "Magie"
 
-#~ msgid "Rings"
-#~ msgstr "Ringen"
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Handelen met %s@@"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Scroll vertraging"
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|%s aanvallen@@"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Scroll radius"
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Annuleren@@"
 
-#~ msgid "Select Server"
-#~ msgstr "Server Selecteren"
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Uitrusten@@"
 
-#~ msgid "Server"
-#~ msgstr "Server"
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Gebruiken@@"
 
-#~ msgid "Shields"
-#~ msgstr "Schilden"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Neerleggen@@"
 
-#~ msgid "Shirts"
-#~ msgstr "Shirts"
+#~ msgid "Select Server"
+#~ msgstr "Server Selecteren"
 
-#~ msgid "Shoes"
-#~ msgstr "Schoenen"
+#~ msgid "Failed to switch to "
+#~ msgstr "Kan niet wisselen naar "
 
-#~ msgid "Shooting"
-#~ msgstr "Schieten"
+#~ msgid "windowed"
+#~ msgstr "in venster"
 
-#~ msgid "Staff"
-#~ msgstr "Staf"
+#~ msgid "fullscreen"
+#~ msgstr "volledig scherm"
+
+#~ msgid "Weapons"
+#~ msgstr "Wapens"
 
 #~ msgid "Stats"
 #~ msgstr "statistieken"
 
-#~ msgid "Sword"
-#~ msgstr "Zwaard"
+#~ msgid "Total"
+#~ msgstr "Totaal"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Tab Accentuering"
+#~ msgid "Cost"
+#~ msgstr "Kosten"
 
-#~ msgid "Text Outline"
-#~ msgstr "Tekstuitlijning"
+#~ msgid "Attack:"
+#~ msgstr "Aanval:"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Tekstschaduw"
+#~ msgid "% Reflex:"
+#~ msgstr "% Reflex:"
 
-#~ msgid "Thrown"
-#~ msgstr "Geworpen"
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Overblijvende statuspunten: %d"
 
-#~ msgid "Total"
-#~ msgstr "Totaal"
+#~ msgid "Max level"
+#~ msgstr "Maximum level"
+
+#~ msgid " host: "
+#~ msgstr " host: "
+
+#~ msgid "Guilds"
+#~ msgstr "Guilds"
+
+#~ msgid "Buddys"
+#~ msgstr "Vrienden"
+
+#~ msgid "Party Window"
+#~ msgstr "Groepsvenster"
 
 #~ msgid "Unarmed"
 #~ msgstr "Ongewapend"
 
+#~ msgid "Knife"
+#~ msgstr "Mes"
+
+#~ msgid "Sword"
+#~ msgstr "Zwaard"
+
+#~ msgid "Staff"
+#~ msgstr "Staf"
+
+#~ msgid "Whip"
+#~ msgstr "Zweep"
+
+#~ msgid "Bow"
+#~ msgstr "Boog"
+
+#~ msgid "Shooting"
+#~ msgstr "Schieten"
+
+#~ msgid "Mace"
+#~ msgstr "Goedendag"
+
+#~ msgid "Axe"
+#~ msgstr "Bijl"
+
+#~ msgid "Thrown"
+#~ msgstr "Geworpen"
+
 #~ msgid "Unknown Skill"
 #~ msgstr "Onbekende vaardigheid"
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Onbekende fout bij het selecteren van personage"
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " kan niet gecreëerd worden, maar het bestaat niet! Verlaten."
 
-#~ msgid "Unnamed"
-#~ msgstr "Naamloos"
+#~ msgid "Couldn't set "
+#~ msgstr "Kan niet instellen van "
 
-#~ msgid "Usables"
-#~ msgstr "Gebruiksvoorwerpen"
+#~ msgid " video mode: "
+#~ msgstr " video modus: "
 
-#~ msgid "Weapons"
-#~ msgstr "Wapens"
+#~ msgid "mana"
+#~ msgstr "mana"
 
-#~ msgid "Whip"
-#~ msgstr "Zweep"
+#~ msgid "Connecting to character server..."
+#~ msgstr "Verbinden met de karakter server..."
 
-#~ msgid "Whisper"
-#~ msgstr "Fluister"
+#~ msgid "Connecting to account server..."
+#~ msgstr "Verbinden met de account server..."
 
-#~ msgid "Willpower:"
-#~ msgstr "Wilskracht:"
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Zelfde functie als create"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Commando: /new <groepsnaam>"
 
 #~ msgid "a"
 #~ msgstr "een"
 
-#~ msgid "fullscreen"
-#~ msgstr "volledig scherm"
+#~ msgid "Unnamed"
+#~ msgstr "Naamloos"
 
-#~ msgid "mana"
-#~ msgstr "mana"
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@pickup|%s oppakken@@"
 
-#~ msgid "no"
-#~ msgstr "nee"
+#~ msgid "Scroll radius"
+#~ msgstr "Scroll radius"
 
-#~ msgid "windowed"
-#~ msgstr "in venster"
+#~ msgid "Scroll laziness"
+#~ msgstr "Scroll vertraging"
diff --git a/po/pl.po b/po/pl.po
index a6e38301..6a2a2b4d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-09-14 06:59+0000\n"
 "Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
 "Language-Team: <pl@li.org>\n"
@@ -22,418 +22,362 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/npcdialog.cpp:183
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Następna"
-
-#: ../src/main.cpp:60
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl   : Wyłącz OpenGL dla tej sesji"
-
-#: ../src/main.cpp:58
-#, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir    : Katalog do użycia jako katalog domowy"
-
-#: ../src/main.cpp:52
-#, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Użyj tego hosta aktualizacji"
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Konfiguracja"
 
-#: ../src/main.cpp:46
+#: src/client.cpp:679
 #, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Plik konfiguracyjny do użycia"
+msgid "Connecting to server"
+msgstr "�ączenie z serwerem map..."
 
-#: ../src/main.cpp:53
+#: src/client.cpp:706
 #, fuzzy
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default     : Wybierz domyślny serwer postaci i postać"
+msgid "Logging in"
+msgstr "Użytkownik"
 
-#: ../src/main.cpp:57
-#, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir    : Katalog do użycia jako katalog domowy"
+#: src/client.cpp:739
+msgid "Entering game world"
+msgstr ""
 
-#: ../src/main.cpp:48
+#: src/client.cpp:804
 #, fuzzy
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password    : Zaloguj z tym hasłem"
+msgid "Requesting characters"
+msgstr "Wybierz postać"
 
-#: ../src/main.cpp:47
+#: src/client.cpp:833
 #, fuzzy
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username    : Zaloguj z tą nazwą użytkownika"
+msgid "Connecting to the game server"
+msgstr "�ączenie z serwerem map..."
 
-#: ../src/main.cpp:49
+#: src/client.cpp:843
 #, fuzzy
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character   : Zaloguj z tÄ… postaciÄ…"
+msgid "Changing game servers"
+msgstr "Serwer"
 
-#: ../src/main.cpp:56
-#, fuzzy
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data        : Katalog, z którego załadować dane gry"
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "BÅ‚Ä…d"
 
-#: ../src/main.cpp:45
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help        : Pokazuje tÄ™ pomoc"
+#: src/client.cpp:888
+msgid "Requesting registration details"
+msgstr ""
 
-#: ../src/main.cpp:51
+#: src/client.cpp:915
 #, fuzzy
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port        : Port serwera logowania"
+msgid "Password Change"
+msgstr "Hasło:"
 
-#: ../src/main.cpp:50
-#, fuzzy
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server      : Nazwa serwera logowania, lub IP"
+#: src/client.cpp:916
+msgid "Password changed successfully!"
+msgstr ""
 
-#: ../src/main.cpp:55
+#: src/client.cpp:935
 #, fuzzy
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Pomiń pobieranie aktualizacji"
+msgid "Email Change"
+msgstr "Zmień"
 
-#: ../src/main.cpp:44
+#: src/client.cpp:936
 #, fuzzy
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version     : Pokazuje wersjÄ™"
-
-#: ../src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1 Jest mocno zalecane abyÅ›"
-
-#: ../src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1 Proces aktualizacji jest niekompletny."
+msgid "Email changed successfully!"
+msgstr "Członek został pomyślnie wypromowany."
 
-#: ../src/gui/updatewindow.cpp:421
+#: src/client.cpp:956
 #, fuzzy
-msgid "##1  you try again later."
-msgstr "##1 spróbował później"
-
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Celność:"
-
-#: ../src/net/tmwa/generalhandler.cpp:230
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "Uderzenie Krytyczne"
-
-#: ../src/net/tmwa/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% Unik:"
-
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr ""
+msgid "Unregister Successful"
+msgstr "Wyrejestruj"
 
-#: ../src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
+#: src/client.cpp:957
+msgid "Farewell, come back any time..."
 msgstr ""
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:291
+#: src/client.cpp:1281
 #, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s dołączył do grupy."
+msgid "Invalid update host: %s"
+msgstr "Nieprawidłowy host aktualizacji: "
 
-#: ../src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
+#: src/client.cpp:1315 src/client.cpp:1321
+msgid "Error creating updates directory!"
+msgstr "BÅ‚Ä…d podczas tworzenia katalogu aktualizacji!"
 
-#: ../src/gui/socialwindow.cpp:561
-#, fuzzy, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
+msgid "Unknown command."
+msgstr "Nieznane polecenie."
 
-#: ../src/gui/socialwindow.cpp:600
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s zaprosił ciebie, byś dołączył do grupy."
+#: src/commandhandler.cpp:160
+msgid "-- Help --"
+msgstr "-- Pomoc --"
 
-#: ../src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#: src/commandhandler.cpp:161
+msgid "/help > Display this help"
+msgstr "/help > Pokazuje tÄ™ pomoc"
 
-#: ../src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s opuścił twoją grupę."
+#: src/commandhandler.cpp:163
+msgid "/where > Display map name"
+msgstr "/where > Wyświetla nazwę mapy"
 
-#: ../src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#: src/commandhandler.cpp:164
+msgid "/who > Display number of online users"
+msgstr "/who > Wyświetla liczbę podłączonych użytkowników"
 
-#: ../src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s już jest członkiem grupy."
+#: src/commandhandler.cpp:165
+msgid "/me > Tell something about yourself"
+msgstr "/me > Powiedz coÅ› o sobie"
 
-#: ../src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s nie jest w twojej grupie!"
+#: src/commandhandler.cpp:167
+msgid "/clear > Clears this window"
+msgstr "/clear > Czyści to okno"
 
-#: ../src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s jest od teraz członkiem twojej grupy."
+#: src/commandhandler.cpp:169
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Wysyła prywatną wiadomość do użytkownika"
 
-#: ../src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s dołączył do grupy."
+#: src/commandhandler.cpp:170
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Alias  polecenia msg"
 
-#: ../src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
+#: src/commandhandler.cpp:171
+msgid "/w > Alias of msg"
+msgstr "/w > Alias polecenia msg"
+
+#: src/commandhandler.cpp:172
+msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
+"/query > Tworzy zakładkę dla prywatnych wiadomości z innym użytkownikiem"
 
-#: ../src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s odmówił zaproszenia."
+#: src/commandhandler.cpp:174
+msgid "/q > Alias of query"
+msgstr "/q > Alias polecenia query"
 
-#: ../src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s odmówił zaproszenia."
+#: src/commandhandler.cpp:176
+msgid "/ignore > ignore a player"
+msgstr ""
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s chce handlować z tobą, zgadzasz się?"
+#: src/commandhandler.cpp:177
+msgid "/unignore > stop ignoring a player"
+msgstr ""
 
-#: ../src/gui/widgets/chattab.cpp:152
-#, fuzzy, c-format
-msgid "%s whispers: %s"
-msgstr "%s szepcze: "
+#: src/commandhandler.cpp:179
+msgid "/list > Display all public channels"
+msgstr "/list > Pokaż wszystkie publiczne kanały"
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
-msgid "(empty)"
-msgstr ""
+#: src/commandhandler.cpp:180
+msgid "/join > Join or create a channel"
+msgstr "/join > Dołącz lub utwórz kanał"
 
-#: ../src/commandhandler.cpp:222
-msgid "*** only available to a GM ***"
-msgstr "*** dostępne tylko dla GM ***"
+#: src/commandhandler.cpp:182
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Utworzenie nowej grupy"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
-msgid "+"
-msgstr ""
+#: src/commandhandler.cpp:183
+msgid "/party > Invite a user to party"
+msgstr "/party > Zaproś użytkownika do grupy"
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
-msgid "-"
-msgstr ""
+#: src/commandhandler.cpp:185
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Rozpocznij zapisywanie czatu do zewnętrznego pliku"
 
-#: ../src/commandhandler.cpp:166
-msgid "-- Help --"
-msgstr "-- Pomoc --"
+#: src/commandhandler.cpp:187
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr "/toggle > Określa czy <return> przełącza dziennik czatu"
+
+#: src/commandhandler.cpp:189
+msgid "/present > Get list of players present (sent to chat log, if logging)"
+msgstr ""
+"/present > Pobiera listę obecnych graczy (przesyła do dzienika czatu, jeżeli "
+"zapisywanie jest włączone)"
 
-#: ../src/commandhandler.cpp:201
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globalne ogłoszenie (tylko GM)"
 
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
+#: src/commandhandler.cpp:196
+msgid "For more information, type /help <command>."
+msgstr "Aby uzyskać więcej informacji, wpisz /help <komenda>"
 
-#: ../src/commandhandler.cpp:173
-msgid "/clear > Clears this window"
-msgstr "/clear > Czyści to okno"
+#: src/commandhandler.cpp:200
+msgid "Command: /help"
+msgstr "Komenda: /help"
 
-#: ../src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Zamyka zakładkę szeptania"
+#: src/commandhandler.cpp:201
+msgid "This command displays a list of all commands available."
+msgstr "Ta komenda wyświetla listę dostępnych komend."
 
-#: ../src/commandhandler.cpp:191
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Utworzenie nowej grupy"
+#: src/commandhandler.cpp:203
+msgid "Command: /help <command>"
+msgstr "Komenda: /help <komenda>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Pokaż/zmień opcje pozdziału doświadczenia w grupie"
+#: src/commandhandler.cpp:204
+msgid "This command displays help on <command>."
+msgstr "Ta komenda wyświetla pomoc dotyczącą <komenda>"
 
-#: ../src/commandhandler.cpp:167
-msgid "/help > Display this help"
-msgstr "/help > Pokazuje tÄ™ pomoc"
+#: src/commandhandler.cpp:212
+msgid "Command: /announce <msg>"
+msgstr "Komenda: /announce <wiadomość>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Wyświetla tą pomoc"
+#: src/commandhandler.cpp:213
+msgid "*** only available to a GM ***"
+msgstr "*** dostępne tylko dla GM ***"
 
-#: ../src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
+#: src/commandhandler.cpp:214
+msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
+"Ta komenda wysyła wiadomość <wiadomość> to wszystkich połączonych graczy."
 
-#: ../src/commandhandler.cpp:185
-msgid "/ignore > ignore a player"
-msgstr ""
+#: src/commandhandler.cpp:219
+msgid "Command: /clear"
+msgstr "Komenda: /clear"
+
+#: src/commandhandler.cpp:220
+msgid "This command clears the chat log of previous chat."
+msgstr "Ta komenda czyści zawartość okna."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
+#: src/commandhandler.cpp:224
 #, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Zaproszenie gracza do twojej grupy"
+msgid "Command: /ignore <player>"
+msgstr "Komenda: /item <zasada>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Zaproszenie gracza do twojej grupy"
+#: src/commandhandler.cpp:225
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Ta komenda wyświetla liczbę połączonych graczy."
 
-#: ../src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > Pokaż/zmień opcje podziału przedmiotu w grupie"
+#: src/commandhandler.cpp:230
+msgid "Command: /join <channel>"
+msgstr "Komenda: /join <kanał>"
 
-#: ../src/commandhandler.cpp:189
-msgid "/join > Join or create a channel"
-msgstr "/join > Dołącz lub utwórz kanał"
+#: src/commandhandler.cpp:231
+msgid "This command makes you enter <channel>."
+msgstr "Ta komenda powoduje, iż wejdziesz do  <kanał>"
 
-#: ../src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Wykop użytkownika z kanału"
+#: src/commandhandler.cpp:232
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Jeżeli <kanał> nie istnieje, to zostanie utworzony."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
-#, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Wykopanie kogoś z grupy, w której jesteś"
+#: src/commandhandler.cpp:236
+msgid "Command: /list"
+msgstr "Komenda: /list"
 
-#: ../src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Wykopanie kogoś z grupy, w której jesteś"
+#: src/commandhandler.cpp:237
+msgid "This command shows a list of all channels."
+msgstr "Ta komenda pokazuje listę wszystkich kanałów."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
-#, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Opuszenie grupy, w której jesteś"
+#: src/commandhandler.cpp:241
+msgid "Command: /me <message>"
+msgstr "Komenda: /me <wiadomość>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Opuszenie grupy, w której jesteś"
+#: src/commandhandler.cpp:242
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Ta komenda mówi innym co (robisz) <wiadomość>."
 
-#: ../src/commandhandler.cpp:188
-msgid "/list > Display all public channels"
-msgstr "/list > Pokaż wszystkie publiczne kanały"
+#: src/commandhandler.cpp:246
+msgid "Command: /msg <nick> <message>"
+msgstr "Komenda: /msg <ksywka> <wiadomość>"
 
-#: ../src/commandhandler.cpp:171
-msgid "/me > Tell something about yourself"
-msgstr "/me > Powiedz coÅ› o sobie"
+#: src/commandhandler.cpp:247
+msgid "Command: /whisper <nick> <message>"
+msgstr "Komenda: /whisper <ksywka> <wiadomość>"
 
-#: ../src/commandhandler.cpp:175
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Wysyła prywatną wiadomość do użytkownika"
+#: src/commandhandler.cpp:248
+msgid "Command: /w <nick> <message>"
+msgstr "Komenda: /w <ksywka> <wiadomość>"
 
-#: ../src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Uczyń użytkownika operatorem kanału"
+#: src/commandhandler.cpp:249
+msgid "This command sends the text <message> to <nick>."
+msgstr "Ta komenda wysyła tekst <wiadomość> do <ksywka>"
 
-#: ../src/commandhandler.cpp:192
-msgid "/party > Invite a user to party"
-msgstr "/party > Zaproś użytkownika do grupy"
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Jeżeli <postać> ma spację, należy ją zapisać w cudzysłowie (\")"
 
-#: ../src/commandhandler.cpp:198
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Pobiera listę obecnych graczy (przesyła do dzienika czatu, jeżeli "
-"zapisywanie jest włączone)"
+#: src/commandhandler.cpp:255
+msgid "Command: /query <nick>"
+msgstr "Komenda: /query <ksywka>"
 
-#: ../src/commandhandler.cpp:180
-msgid "/q > Alias of query"
-msgstr "/q > Alias polecenia query"
+#: src/commandhandler.cpp:256
+msgid "Command: /q <nick>"
+msgstr "Komenda: /q <ksywka>"
 
-#: ../src/commandhandler.cpp:178
-msgid "/query > Makes a tab for private messages with another user"
+#: src/commandhandler.cpp:257
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
-"/query > Tworzy zakładkę dla prywatnych wiadomości z innym użytkownikiem"
+"Ta komeda próbuje utworzyć zakładkę dla prywatnych wiadomości pomiędzy tobą "
+"i <ksywka>."
 
-#: ../src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Opuszcza kanał"
+#: src/commandhandler.cpp:262
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Komenda: /create <nazwa-grupy>"
 
-#: ../src/commandhandler.cpp:194
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Rozpocznij zapisywanie czatu do zewnętrznego pliku"
+#: src/commandhandler.cpp:263
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Te komendy utworzÄ… nowÄ… grupÄ™ nazwanÄ… <nazwa-grupy>."
 
-#: ../src/commandhandler.cpp:196
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Określa czy <return> przełącza dziennik czatu"
+#: src/commandhandler.cpp:267
+msgid "Command: /party <nick>"
+msgstr "Komenda: /party <ksywka>"
 
-#: ../src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Ustawia temat obecnego kanału"
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
 
-#: ../src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+#: src/commandhandler.cpp:274
+msgid "Command: /present"
+msgstr "Komenda: /present"
 
-#: ../src/commandhandler.cpp:186
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:275
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
 msgstr ""
+"Ta komenda pobiera listę graczy w zasięgu słuchu i wysyła ją do dziennika "
+"zapisu, lub dziennika czatu."
 
-#: ../src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Pokazuje listę użytkowników w obecnym kanale"
-
-#: ../src/commandhandler.cpp:177
-msgid "/w > Alias of msg"
-msgstr "/w > Alias polecenia msg"
-
-#: ../src/commandhandler.cpp:169
-msgid "/where > Display map name"
-msgstr "/where > Wyświetla nazwę mapy"
+#: src/commandhandler.cpp:281
+msgid "Command: /record <filename>"
+msgstr "Komenda: /record <nazwa_pliku>"
 
-#: ../src/commandhandler.cpp:176
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias  polecenia msg"
+#: src/commandhandler.cpp:282
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+"Ta komenda rozpoczyna zapisywanie dziennika czatu to pliku <nazwa_pliku."
 
-#: ../src/commandhandler.cpp:170
-msgid "/who > Display number of online users"
-msgstr "/who > Wyświetla liczbę podłączonych użytkowników"
+#: src/commandhandler.cpp:284
+msgid "Command: /record"
+msgstr "Komenda: /record"
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr ""
+#: src/commandhandler.cpp:285
+msgid "This command finishes a recording session."
+msgstr "Ta komenda kończy zapisywanie sesji"
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr ""
-"<zasada> może być jedną z \"1\", \"yes\", \"true\" aby aktywować pozdział "
-"doświadczenia, lub \"0\", \"no\", \"false\" aby wyłączyć pozdział "
-"doświadczenia."
+#: src/commandhandler.cpp:289
+msgid "Command: /toggle <state>"
+msgstr "Komenda: /toggle <stan>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/commandhandler.cpp:290
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
-"<zasada> może być jedną z \"1\", \"yes\", \"true\" aby aktywować pozdział "
-"przedmiotu lub \"0\", \"no\", \"false\" by wyłączyć podział przedmiotu."
+"Ta komenda ustawia, czy klawisz return powinien włączać dziennik zapisu, lub "
+"czy dziennik zapisu powinien się automatycznie wyłączyć."
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -441,3522 +385,3436 @@ msgstr ""
 "<stan> może być jednym z \"1\", \"yes\", \"true\" aby uaktywnić przełącznik, "
 "lub \"0\", \"no\", \"false\" by deaktywować przełącznik."
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ""
+#: src/commandhandler.cpp:295
+msgid "Command: /toggle"
+msgstr "Komenda: /toggle"
 
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: src/commandhandler.cpp:296
+msgid "This command displays the return toggle status."
+msgstr "Ta komenda wyświetla status przełącznika"
 
-#: ../src/gui/socialwindow.cpp:566
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
-msgid "Accept Guild Invite"
-msgstr "Zaakceptuj zaproszenie do grupy"
+msgid "Command: /unignore <player>"
+msgstr "Komenda: /item <zasada>"
 
-#: ../src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Zaakceptuj zaproszenie do grupy"
+#: src/commandhandler.cpp:301
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:466
-#, fuzzy, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Zaakceptowano zaproszenie od %s."
+#: src/commandhandler.cpp:306
+msgid "Command: /where"
+msgstr "Komenda: /where"
 
-#: ../src/gui/socialwindow.cpp:447
-#, fuzzy, c-format
-msgid "Accepted party invite from %s."
-msgstr "Zaakceptowano zaproszenie od %s."
+#: src/commandhandler.cpp:307
+msgid "This command displays the name of the current map."
+msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
 
-#: ../src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Akceptowanie przychodzących próśb o handel"
+#: src/commandhandler.cpp:311
+msgid "Command: /who"
+msgstr "Komenda: /who"
 
-#: ../src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Akceptowanie nadchodzących próśb o handel."
+#: src/commandhandler.cpp:312
+msgid "This command displays the number of players currently online."
+msgstr "Ta komenda wyświetla liczbę połączonych graczy."
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
+#: src/commandhandler.cpp:318
+msgid "Type /help for a list of commands."
+msgstr "Wpisz /help aby usyskać listę komend."
+
+#: src/commandhandler.cpp:384
+msgid "Cannot send empty whispers!"
+msgstr "Nie można wysłać pustych szeptów!"
+
+#: src/commandhandler.cpp:392
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
+"Nie można utworzyć zakładki szeptu dla ksywki \"%s\"! Już istnieje, albo to "
+"ty."
 
-#: ../src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "ZarzÄ…dzanie kontem i postaciami"
+#: src/commandhandler.cpp:406
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Prośba o dołączenie do kanału %s."
 
-#: ../src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Account banned"
-msgstr "Konto wygasło"
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Brakuje nazwy grupy."
 
-#: ../src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Account banned."
-msgstr "Konto wygasło"
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
+msgid "Please specify a name."
+msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:162
-#, fuzzy
-msgid "Account expired."
-msgstr "Konto wygasło"
+#: src/commandhandler.cpp:450
+msgid "Return toggles chat."
+msgstr "Return włącza czat."
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Konto niepołączone. Proszę najpierw się zalogować."
+#: src/commandhandler.cpp:450
+msgid "Message closes chat."
+msgstr "Wiadomość zamyka czat."
 
-#: ../src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Nie znaleziono Konta. Proszę zalogować się ponownie."
+#: src/commandhandler.cpp:459
+msgid "Return now toggles chat."
+msgstr "Return od teraz włącza czat."
 
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
-msgstr "Konto: %s"
+#: src/commandhandler.cpp:463
+msgid "Message now closes chat."
+msgstr "Wiadomość od teraz zamyka czat."
 
-#: ../src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Dodaj"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:171
-#, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|Dodaj imiÄ™ do czatu@@"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
+msgid "Player already ignored!"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
+#: src/commandhandler.cpp:522
 #, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Dodaj do czatu@@"
+msgid "Player successfully ignored!"
+msgstr "Pomyślnie utworzono grupę."
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Zwinność"
+#: src/commandhandler.cpp:524
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "Zwinność %+d"
+#: src/commandhandler.cpp:539
+msgid "Player wasn't ignored!"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Zwinność:"
+#: src/commandhandler.cpp:544
+msgid "Player no longer ignored!"
+msgstr ""
 
-#: ../src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Akceptuj handel"
+#: src/commandhandler.cpp:546
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: ../src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Zaakceptowano. Oczekiwanie..."
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Opcjami dla /%s sÄ… \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: ../src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "wszystkie"
+#: src/game.cpp:172
+msgid "General"
+msgstr "Ogólny"
 
-#: ../src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Zezwól na handel"
+#: src/game.cpp:342
+#, fuzzy
+msgid "Screenshot saved as "
+msgstr "Zrzut ekranu zapisany do ~/"
 
-#: ../src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Zezwól na szepty"
+#: src/game.cpp:347
+msgid "Saving screenshot failed!"
+msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
+#: src/game.cpp:378
 #, fuzzy
-msgid "Already logged in."
-msgstr "Już zalogowany"
+msgid "The connection to the server was lost."
+msgstr "Połączenie z serwerem zostało utracone, program zakończy pracę"
 
-#: ../src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Już zapisuje."
+#: src/game.cpp:382
+msgid "Network Error"
+msgstr "BÅ‚Ä…d sieci"
 
-#: ../src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Efekty otoczenia"
+#: src/game.cpp:721
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorowanie przychodzących próśb o handel"
 
-#: ../src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "Efekty otoczenia"
+#: src/game.cpp:726
+msgid "Accepting incoming trade requests"
+msgstr "Akceptowanie przychodzących próśb o handel"
+
+#: src/game.cpp:954
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Nie można załadować mapy"
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/game.cpp:955
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Nieznany członek próbował powiedzieć: %s"
+msgid "Error while loading %s"
+msgstr "BÅ‚Ä…d podczas Å‚Ä…dowania %s"
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Unicestwiony."
+#: src/gui/beingpopup.cpp:76
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Grupa (%s)"
 
-#: ../src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Zastosuj"
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Kup"
 
-#: ../src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Cena: %s/ Razem: %s"
 
-#: ../src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
+msgid "+"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
+msgid "-"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:168
-#, fuzzy, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Czy na pewno chcesz wyjść?"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Wyjdź"
 
-#: ../src/gui/socialwindow.cpp:247
-#, fuzzy, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Czy na pewno chcesz wyjść?"
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
+msgid "Max"
+msgstr "Maks."
 
-#: ../src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Przypisz"
+#: src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Sklep"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Atak"
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Sprzedaj"
+
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Zmień adres Email"
 
-#: ../src/resources/itemdb.cpp:53
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
-msgid "Attack %+d"
-msgstr "Atak %+d"
+msgid "Account: %s"
+msgstr "Konto: %s"
+
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
+msgstr "Wpisz dwukrotnie nowy adres email:"
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: src/gui/changeemaildialog.cpp:127
 #, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Atak %+d"
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
 
-#: ../src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "Dozór wpisany do dziennika zapisu"
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
 
-#: ../src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Dźwięk"
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "Nowy Adres Email już istnieje"
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
+msgid "Change Password"
+msgstr "Zmień hasło"
+
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Hasło:"
 
-#: ../src/net/tmwa/generalhandler.cpp:129
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
-msgid "Authentication failed."
-msgstr "Uwierzytelnienie nie powiodło się"
+msgid "Type new password twice:"
+msgstr "Wpisz dwukrotnie nowe hasło:"
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:100
+#: src/gui/changepassworddialog.cpp:116
 #, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|Zaprzyjaźnij się z %s@@"
+msgid "The new password needs to be at least %d characters long."
+msgstr "Hasło musi mieć conajmniej %d znaków."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Hasło nie może mieć więcej jak %d znaków."
 
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Byty"
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Opuściło cię życie. Teraz spoczywasz w spokoju."
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Stwórz postać"
 
-#: ../src/playerrelations.cpp:342
-msgid "Blink name"
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "ImiÄ™:"
+
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:138
-#, fuzzy
-msgid "Blue:"
-msgstr "Niebieski: "
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "BÄ…belki z imionami"
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
+msgstr "Kolor włosów:"
 
-#: ../src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "BÄ…belki, brak imion"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
+msgstr "Fryzura:"
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Kup"
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
+msgid "Create"
+msgstr "Utwórz"
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Kalibruj"
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "Mężczyzna"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Anuluj"
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "Kobieta"
 
-#: ../src/commandhandler.cpp:422
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"Nie można utworzyć zakładki szeptu dla ksywki \"%s\"! Już istnieje, albo to "
-"ty."
+msgid "Please distribute %d points"
+msgstr "Proszę wykorzystać %d punktów"
 
-#: ../src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "Twoje imię musi mieć conajmniej 4 znaki."
 
-#: ../src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
+msgstr "Statystyki postaci w porzÄ…dku."
 
-#: ../src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "Nie można wysłać pustego czatu!"
+#: src/gui/charcreatedialog.cpp:256
+#, c-format
+msgid "Please remove %d points"
+msgstr "Proszę usunąć %d punktów"
 
-#: ../src/commandhandler.cpp:401
-msgid "Cannot send empty whispers!"
-msgstr "Nie można wysłać pustych szeptów!"
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Potwierdź usunięcie postaci"
 
-#: ../src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Nie można krzyknąć!"
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "Nie można uzyć tego ID"
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr "ZarzÄ…dzanie kontem i postaciami"
 
-#: ../src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Zmień"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Wyrejestruj"
 
-#: ../src/gui/charselectdialog.cpp:150
+#: src/gui/charselectdialog.cpp:150
 #, fuzzy
 msgid "Change Email"
 msgstr "Zmień adres Email"
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Zmień adres Email"
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Usuń"
 
-#: ../src/gui/worldselectdialog.cpp:76
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
-msgid "Change Login"
-msgstr "Zmień"
+msgid "Choose"
+msgstr "Zamknij"
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Zmień hasło"
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
+msgid "(empty)"
+msgstr ""
 
-#: ../src/gui/login.cpp:62
-#, fuzzy
-msgid "Change Server"
-msgstr "Serwer"
+#: src/gui/chat.cpp:88
+msgid "Chat"
+msgstr "Czat"
 
-#: ../src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "Efekty nastÄ…piÄ… po zmianie mapy."
+#: src/gui/chat.cpp:311
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
+msgstr "%d graczy jest obecnych."
 
-#: ../src/client.cpp:813
-#, fuzzy
-msgid "Changing game servers"
-msgstr "Serwer"
+#: src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Dozór wpisany do dziennika zapisu"
 
-#: ../src/gui/setup_video.cpp:460
-#, fuzzy
-msgid "Changing to OpenGL"
-msgstr "Zmień na OpenGL"
+#: src/gui/chat.cpp:493
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Szepczesz do %s: %s"
 
-#: ../src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
-msgstr "Operatorzy kanału mogą wykopywać i dawać opy użytkownikom kanału."
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Tak"
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "Kanały nie są wspierane!"
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Nie"
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Usunięto postać."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: ../src/gui/statuswindow.cpp:238
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
 #, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Statystyki postaci w porzÄ…dku."
+msgid "Music: %s"
+msgstr "Temat: %s"
 
-#: ../src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Statystyki postaci w porzÄ…dku."
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "ImiÄ™: %s"
 
-#: ../src/net/manaserv/charhandler.cpp:143
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Nazwa użytkownika już istnieje"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "MiniMapa"
 
-#: ../src/net/manaserv/charhandler.cpp:155
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Statystyki postaci w porzÄ…dku."
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:158
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Statystyki postaci w porzÄ…dku."
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Efekty CzÄ…steczkowe"
 
-#: ../src/gui/chat.cpp:87
-msgid "Chat"
-msgstr "Czat"
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Detale czÄ…steczek"
 
-#: ../src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Okno Czatu"
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Efekty otoczenia"
 
-#: ../src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Utworzenie czatu nieudane!"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Ekwipunek"
 
-#: ../src/gui/charselectdialog.cpp:380
-#, fuzzy
-msgid "Choose"
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
+msgid "Unequip"
+msgstr "Zdejmij"
+
+#: src/gui/help.cpp:37
+msgid "Help"
+msgstr "Pomoc"
+
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
+msgid "Close"
 msgstr "Zamknij"
 
-#: ../src/gui/worldselectdialog.cpp:77
-#, fuzzy
-msgid "Choose World"
-msgstr "Wybierz twój serwer"
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inwentarz"
 
-#: ../src/gui/serverdialog.cpp:196
-#, fuzzy
-msgid "Choose Your Server"
-msgstr "Wybierz twój serwer"
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Magazyn"
 
-#: ../src/gui/socialwindow.cpp:544
-#, fuzzy
-msgid "Choose your guild's name."
-msgstr "Wybierz twój serwer"
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Miejsc:"
 
-#: ../src/gui/socialwindow.cpp:630
-#, fuzzy
-msgid "Choose your party's name."
-msgstr "Wybierz twój serwer"
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
+msgid "Equip"
+msgstr "Załóż"
 
-#: ../src/gui/npcdialog.cpp:98
-msgid "Clear log"
-msgstr ""
+#: src/gui/inventorywindow.cpp:88
+msgid "Use"
+msgstr "Użyj"
 
-#: ../src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Wersja klienta jest zbyt stara"
-
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
-msgid "Close"
-msgstr "Zamknij"
+msgid "Drop..."
+msgstr "Upuść"
 
-#: ../src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Kolory"
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
+msgid "Split"
+msgstr "Podziel"
 
-#: ../src/commandhandler.cpp:221
-msgid "Command: /announce <msg>"
-msgstr "Komenda: /announce <wiadomość>"
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
 
-#: ../src/commandhandler.cpp:274
-#, fuzzy
-msgid "Command: /away"
-msgstr "Komenda: /who"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
+msgstr "Waga:"
 
-#: ../src/commandhandler.cpp:271
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Komenda: /w <ksywka> <wiadomość>"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Przechowaj"
 
-#: ../src/commandhandler.cpp:228
-msgid "Command: /clear"
-msgstr "Komenda: /clear"
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Pobierz"
 
-#: ../src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Komenda: /close"
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
+msgid "Drop"
+msgstr "Upuść"
 
-#: ../src/commandhandler.cpp:279
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Komenda: /create <nazwa-grupy>"
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
+msgid "OK"
+msgstr "Ok"
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Komenda: /exp"
+#: src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "wszystkie"
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Komenda: /exp <zadada>"
+#: src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Wybierz ilość przedmiotów do handlu."
 
-#: ../src/commandhandler.cpp:209
-msgid "Command: /help"
-msgstr "Komenda: /help"
+#: src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
-#: ../src/commandhandler.cpp:212
-msgid "Command: /help <command>"
-msgstr "Komenda: /help <komenda>"
+#: src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Podaj ilość rzeczy do przechowania."
 
-#: ../src/gui/widgets/whispertab.cpp:88
-#, fuzzy
-msgid "Command: /ignore"
-msgstr "Komenda: /przedmiot"
+#: src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Wybierz ilość przedmiotów do pobrania."
 
-#: ../src/commandhandler.cpp:233
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Komenda: /item <zasada>"
+#: src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Wybierz ilość przedmiotów do podziału."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Komenda: /invite <ksywka>"
+#: src/gui/itempopup.cpp:137
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Waga: "
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Komenda: /przedmiot"
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
+msgid "Login"
+msgstr "Użytkownik"
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Komenda: /item <zasada>"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Remember username"
+msgstr "Zapamiętaj użytkownika"
 
-#: ../src/commandhandler.cpp:239
-msgid "Command: /join <channel>"
-msgstr "Komenda: /join <kanał>"
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "Rejestruj"
 
-#: ../src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Komenda: /kick <ksywka>"
+#: src/gui/login.cpp:62
+#, fuzzy
+msgid "Change Server"
+msgstr "Serwer"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Komenda: /leave"
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Podział przedmiotu wyłączony."
 
-#: ../src/commandhandler.cpp:245
-msgid "Command: /list"
-msgstr "Komenda: /list"
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
 
-#: ../src/commandhandler.cpp:250
-msgid "Command: /me <message>"
-msgstr "Komenda: /me <wiadomość>"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Mapa"
 
-#: ../src/commandhandler.cpp:255
-msgid "Command: /msg <nick> <message>"
-msgstr "Komenda: /msg <ksywka> <wiadomość>"
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Komenda: /op <ksywka>"
+#: src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Oczekiwanie na serwer"
 
-#: ../src/commandhandler.cpp:284
-msgid "Command: /party <nick>"
-msgstr "Komenda: /party <ksywka>"
+#: src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Następna"
 
-#: ../src/commandhandler.cpp:291
-msgid "Command: /present"
-msgstr "Komenda: /present"
+#: src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Zatwierdź"
 
-#: ../src/commandhandler.cpp:265
-msgid "Command: /q <nick>"
-msgstr "Komenda: /q <ksywka>"
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: ../src/commandhandler.cpp:264
-msgid "Command: /query <nick>"
-msgstr "Komenda: /query <ksywka>"
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Komenda: /quit"
+#: src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Resetuj"
 
-#: ../src/commandhandler.cpp:301
-msgid "Command: /record"
-msgstr "Komenda: /record"
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:208
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Następna"
 
-#: ../src/commandhandler.cpp:298
-msgid "Command: /record <filename>"
-msgstr "Komenda: /record <nazwa_pliku>"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Do:"
 
-#: ../src/commandhandler.cpp:312
-msgid "Command: /toggle"
-msgstr "Komenda: /toggle"
+#: src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Wyślij"
 
-#: ../src/commandhandler.cpp:306
-msgid "Command: /toggle <state>"
-msgstr "Komenda: /toggle <stan>"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy."
 
-#: ../src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Komenda: /topic <wiadomość>"
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
+#: src/gui/outfitwindow.cpp:70
 #, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Komenda: /item <zasada>"
+msgid "Unequip first"
+msgstr "Zdejmij"
 
-#: ../src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Komenda: /users"
+#: src/gui/popupmenu.cpp:83
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Handel z %s"
 
-#: ../src/commandhandler.cpp:257
-msgid "Command: /w <nick> <message>"
-msgstr "Komenda: /w <ksywka> <wiadomość>"
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Atak %+d"
 
-#: ../src/commandhandler.cpp:323
-msgid "Command: /where"
-msgstr "Komenda: /where"
+#: src/gui/popupmenu.cpp:91
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Szept"
 
-#: ../src/commandhandler.cpp:256
-msgid "Command: /whisper <nick> <message>"
-msgstr "Komenda: /whisper <ksywka> <wiadomość>"
+#: src/gui/popupmenu.cpp:100
+#, fuzzy, c-format
+msgid "Befriend %s"
+msgstr "@@friend|Zaprzyjaźnij się z %s@@"
 
-#: ../src/commandhandler.cpp:328
-msgid "Command: /who"
-msgstr "Komenda: /who"
+#: src/gui/popupmenu.cpp:105
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Nielubiany"
 
-#: ../src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Zakończono"
+#: src/gui/popupmenu.cpp:108
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Ignorowany"
 
-#: ../src/playerrelations.cpp:312
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Kompletnie ignoruj %s@@"
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:117
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Kompletnie ignoruj %s@@"
 
-#: ../src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Potwierdź usunięcie postaci"
-
-#: ../src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Potwierdź:"
-
-#: ../src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Potwierdzono. Oczekiwanie..."
+#: src/gui/popupmenu.cpp:130
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
+msgstr "@@guild|Zaproś %s aby dołączył do twojej gildii@@"
 
-#: ../src/keyboardconfig.cpp:184
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr "Rozwiąż je, albo granie może być utrudnione."
+msgid "Invite %s to join your party"
+msgstr "@@party|ZaproÅ› %s do grupy@@"
 
-#: ../src/gui/serverdialog.cpp:233
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
-msgid "Connect"
-msgstr "�ączenie..."
+msgid "Kick player"
+msgstr "Wykopanie nie powiodło się!"
 
-#: ../src/client.cpp:655
-#, fuzzy
-msgid "Connecting to server"
-msgstr "�ączenie z serwerem map..."
+#: src/gui/popupmenu.cpp:150
+#, fuzzy, c-format
+msgid "Talk to %s"
+msgstr "@@talk|Rozmawiaj z %s@@"
 
-#: ../src/client.cpp:803
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
-msgid "Connecting to the game server"
-msgstr "�ączenie z serwerem map..."
-
-#: ../src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "�ączenie..."
+msgid "Kick monster"
+msgstr "@@admin-kick|Wykop potwora@@"
 
-#: ../src/net/tmwa/network.cpp:414
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
-msgid "Connection to server terminated. "
-msgstr "�ączenie z serwerem map..."
-
-#: ../src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr ""
+msgid "Add name to chat"
+msgstr "@@name|Dodaj imiÄ™ do czatu@@"
 
-#: ../src/gui/statuswindow.cpp:244
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Punkty umiejętności: %d"
+msgid "Pick up %s"
+msgstr "PodnieÅ›"
 
-#: ../src/game.cpp:950
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
-msgid "Could Not Load Map"
-msgstr "Nie można załadować mapy"
+msgid "Add to chat"
+msgstr "@@chat|Dodaj do czatu@@"
 
-#: ../src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "Nie można utworzyć grupy."
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Zmień serwer"
 
-#: ../src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
-msgstr ""
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Zmień postać"
 
-#: ../src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Nie można dołączyć do grupy!"
+#: src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Zakończono zapisywanie."
 
-#: ../src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "Nie mogę nic ukraść..."
+#: src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Obecnie nie zapisuje."
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Utwórz"
+#: src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Już zapisuje."
 
-#: ../src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Stwórz postać"
+#: src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Rozpoczęcie zapisywania..."
 
-#: ../src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Utwórz Gildię"
+#: src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Rozpoczęcie zapisywania nie powiodło się."
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
-#, fuzzy
-msgid "Create Party"
-msgstr "Stwórz postać"
+#: src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Zapisywanie..."
 
-#: ../src/gui/socialwindow.cpp:507
-#, fuzzy, c-format
-msgid "Creating guild called %s."
-msgstr "BÅ‚Ä…d podczas tworzenia gildii."
+#: src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Zatrzymaj zapisywanie"
 
-#: ../src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Potwierdź:"
+
+#: src/gui/register.cpp:100
+msgid "Email:"
+msgstr "Email:"
 
-#: ../src/gui/socialwindow.cpp:529
+#: src/gui/register.cpp:166
 #, c-format
-msgid "Creating party called %s."
-msgstr ""
+msgid "The username needs to be at least %d characters long."
+msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
 
-#: ../src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
 
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Uderzenie Krytyczne"
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Hasło musi mieć conajmniej %d znaków."
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+msgid "The password needs to be less than %d characters long."
+msgstr "Hasło nie może mieć więcej jak %d znaków."
 
-#: ../src/gui/serverdialog.cpp:234
-#, fuzzy
-msgid "Custom Server"
-msgstr "WÅ‚asny kursor"
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Hasła nie zgadzają się."
 
-#: ../src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "WÅ‚asny kursor"
+#: src/gui/serverdialog.cpp:197
+#, fuzzy
+msgid "Choose Your Server"
+msgstr "Wybierz twój serwer"
 
-#: ../src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
-msgstr ""
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Serwer:"
 
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr ""
+#: src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Port:"
 
-#: ../src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Okno diagnostyczne"
+#: src/gui/serverdialog.cpp:208
+#, fuzzy
+msgid "Server type:"
+msgstr "Serwer:"
 
-#: ../src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Domyślny"
+#: src/gui/serverdialog.cpp:229
+#, fuzzy
+msgid "Connect"
+msgstr "�ączenie..."
 
-#: ../src/net/tmwa/generalhandler.cpp:225
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
-msgid "Defense"
-msgstr "Obrona:"
+msgid "Custom Server"
+msgstr "WÅ‚asny kursor"
+
+#: src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Proszę wpisać adres i port serwera"
 
-#: ../src/resources/itemdb.cpp:54
+#: src/gui/serverdialog.cpp:441
 #, c-format
-msgid "Defense %+d"
-msgstr "Obrona %+d"
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:93
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
-msgid "Delay:"
-msgstr "Opóźnienie: "
+msgid "Waiting for server..."
+msgstr "Oczekiwanie na serwer"
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Usuń"
+#: src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Zręczność"
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: src/gui/serverdialog.cpp:552
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Zręczność %+d"
+msgid "requires v%s"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Zręczność:"
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Dźwięk"
 
-#: ../src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:105
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "Nielubiany"
+#: src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Dźwięk"
 
-#: ../src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Nielubiany"
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Głośność efektów dźwiękowych"
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Czy chesz zidentyfikować twoje rzeczy?"
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Głośność muzyki"
 
-#: ../src/gui/setup_audio.cpp:43
-msgid "Download music"
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Brak tekstu"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:442
-#, c-format
-msgid "Downloading server list...%2.2f%%"
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
-msgid "Drop"
-msgstr "Upuść"
+#: src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "Kolor będzie wyglądał w ten sposób"
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
-#, fuzzy
-msgid "Drop..."
-msgstr "Upuść"
+#: src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Kolory"
 
-#: ../src/net/tmwa/generalhandler.cpp:145
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
-msgid "Duplicated login."
-msgstr "Zduplikowany login"
+msgid "Type:"
+msgstr "Typ: "
+
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Statyczny"
 
-#: ../src/client.cpp:905
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Puls"
+
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Tęcza"
+
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Widmo"
+
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
-msgid "Email Change"
-msgstr "Zmień"
+msgid "Delay:"
+msgstr "Opóźnienie: "
 
-#: ../src/net/manaserv/loginhandler.cpp:309
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Adres email już istnieje"
+msgid "Red:"
+msgstr "Czerwony: "
 
-#: ../src/client.cpp:906
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
-msgid "Email changed successfully!"
-msgstr "Członek został pomyślnie wypromowany."
+msgid "Green:"
+msgstr "Zielony: "
 
-#: ../src/gui/register.cpp:100
-msgid "Email:"
-msgstr "Email:"
+#: src/gui/setup_colors.cpp:139
+#, fuzzy
+msgid "Blue:"
+msgstr "Niebieski: "
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Skrót Emotki %d"
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Zastosuj"
 
-#: ../src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr "Okno Skrótów Emotek"
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Zresetuj okna"
 
-#: ../src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Emotka nieudana!"
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Naciśnij przycisk aby rozpocząć kalibrację"
 
-#: ../src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Kalibruj"
 
-#: ../src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr "WÅ‚Ä…cz joystick"
 
-#: ../src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Włącz/Wysłącz Handlowanie"
-
-#: ../src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: ../src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr ""
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: ../src/client.cpp:715
-msgid "Entering game world"
-msgstr ""
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Zatrzymaj"
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
-msgid "Equip"
-msgstr "Załóż"
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Obróć drążek"
 
-#: ../src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
-msgstr "Najpierw załóż strzały."
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Klawiatura"
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Ekwipunek"
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Przypisz"
 
-#: ../src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Okno Ekwipunku"
+#: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Przypisz"
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "BÅ‚Ä…d"
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Domyślny"
 
-#: ../src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "BÅ‚Ä…d podczas tworzenia gildii."
+#: src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Wykryto konflikt klawiszy."
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
-msgid "Error creating updates directory!"
-msgstr "BÅ‚Ä…d podczas tworzenia katalogu aktualizacji!"
+#: src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Nazwa"
 
-#: ../src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Komenda: /join <kanał>"
+#: src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Relacja"
 
-#: ../src/gui/serverdialog.cpp:456
-msgid "Error retreiving server list!"
-msgstr ""
+#: src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutralny"
 
-#: ../src/game.cpp:951
-#, c-format
-msgid "Error while loading %s"
-msgstr "BÅ‚Ä…d podczas Å‚Ä…dowania %s"
+#: src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Przyjaciel"
 
-#: ../src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
+#: src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Nielubiany"
 
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "Powiadomienie o Exp"
+#: src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Ignorowany"
 
-#: ../src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "Exp:"
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
+msgid "???"
+msgstr "???"
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr "Podział doświadczenia wyłączony."
+#: src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Zezwól na handel"
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr "Podział doświadczenia włączony."
+#: src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Zezwól na szepty"
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr "Podział doświadczenia nie jest możliwy."
+#: src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Umieść wszystkie szepty w zakładkach"
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
+#: src/gui/setup_players.cpp:233
 #, fuzzy
-msgid "Experience sharing unknown."
-msgstr "Podział doświadczenia włączony."
+msgid "Show gender"
+msgstr "Pokaż imię"
 
-#: ../src/gui/setup_video.cpp:238
+#: src/gui/setup_players.cpp:235
 #, fuzzy
-msgid "FPS limit:"
-msgstr "Limit FPS:"
-
-#: ../src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Dodanie przedmiotu nie powiodło się z nieznanego powodu."
+msgid "Enable Chat log"
+msgstr "Nie można sprzedać."
 
-#: ../src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-"Dodanie przedmiotu nie powiodło się. Kontrahent nie posiada wolnego miejsca."
+#: src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Gracze"
 
-#: ../src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Dodanie przedmiotu nie powiodło się. Kontrahent jest przeciążony."
+#: src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "Gdy ignorowany:"
 
-#: ../src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
-"rodzaj przedmiotu w okienku."
+#: src/gui/setup_video.cpp:134
+msgid "Tiny"
+msgstr "Drobna"
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Utworzenie postaci nie powiodło się. Najprawdopodobniej imię jest już zajęte."
+#: src/gui/setup_video.cpp:135
+msgid "Small"
+msgstr "Mała"
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "Usunięcie gracza nie powiodło się."
+#: src/gui/setup_video.cpp:136
+msgid "Medium"
+msgstr "Åšrednia"
 
-#: ../src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Promocja Członka nie powiodła się."
+#: src/gui/setup_video.cpp:137
+msgid "Large"
+msgstr "Duża"
 
-#: ../src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy."
+#: src/gui/setup_video.cpp:163
+msgid "No text"
+msgstr "Brak tekstu"
 
-#: ../src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Rozpoczęcie zapisywania nie powiodło się."
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Tekst"
 
-#: ../src/gui/setup_video.cpp:434
-#, fuzzy
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
+#: src/gui/setup_video.cpp:165
+msgid "Bubbles, no names"
+msgstr "BÄ…belki, brak imion"
 
-#: ../src/gui/setup_video.cpp:428
-#, fuzzy
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
+#: src/gui/setup_video.cpp:166
+msgid "Bubbles with names"
+msgstr "BÄ…belki z imionami"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
-msgid "Failed to use item."
-msgstr "Użycie przedmiotu nie powiodło się."
+#: src/gui/setup_video.cpp:178
+msgid "off"
+msgstr "wyłączone"
 
-#: ../src/client.cpp:927
-msgid "Farewell, come back any time..."
-msgstr ""
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
+msgid "low"
+msgstr "niskie"
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
-msgid "Female"
-msgstr "Kobieta"
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
+msgid "high"
+msgstr "wysokie"
 
-#: ../src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "Znajdź Ścieżkę do Myszy"
+#: src/gui/setup_video.cpp:193
+msgid "medium"
+msgstr "średnie"
 
-#: ../src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Zakończono zapisywanie."
+#: src/gui/setup_video.cpp:195
+msgid "max"
+msgstr "max"
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:217
+msgid "Full screen"
+msgstr "Pełen ekran"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:218
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Rozmiar czcionki"
+#: src/gui/setup_video.cpp:219
+msgid "Custom cursor"
+msgstr "WÅ‚asny kursor"
 
-#: ../src/commandhandler.cpp:205
-msgid "For more information, type /help <command>."
-msgstr "Aby uzyskać więcej informacji, wpisz /help <komenda>"
+#: src/gui/setup_video.cpp:221
+msgid "Visible names"
+msgstr "Widoczne imiona"
 
-#: ../src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Przyjaciel"
+#: src/gui/setup_video.cpp:223
+msgid "Particle effects"
+msgstr "Efekty czÄ…steczkowe"
 
-#: ../src/gui/setup_video.cpp:219
-msgid "Full screen"
-msgstr "Pełen ekran"
+#: src/gui/setup_video.cpp:225
+#, fuzzy
+msgid "Show own name"
+msgstr "Pokaż imię"
 
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "Imiona GM"
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
 
-#: ../src/net/tmwa/gamehandler.cpp:101
-#, fuzzy
-msgid "Game"
-msgstr "Nazwa"
+#: src/gui/setup_video.cpp:227
+msgid "Show pickup notification"
+msgstr "Pokaż powiadomienie o podniesieniu"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Koniec gry!"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
+msgid "in chat"
+msgstr "w czacie"
 
-#: ../src/game.cpp:169
-msgid "General"
-msgstr "Ogólny"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
+msgid "as particle"
+msgstr "jako czÄ…steczkÄ™"
 
-#: ../src/gui/widgets/chattab.cpp:126
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Ogłoszenie ogólne od %s:"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "FPS limit:"
+msgstr "Limit FPS:"
 
-#: ../src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Ogłoszenie ogólne:"
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
-msgstr "Rozłączono z serwerem!"
+#: src/gui/setup_video.cpp:250
+msgid "Video"
+msgstr "Obraz"
 
-#: ../src/gui/setup_colors.cpp:123
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Green:"
-msgstr "Zielony: "
+msgid "Show damage"
+msgstr "Pokaż imię"
+
+#: src/gui/setup_video.cpp:258
+msgid "Overhead text"
+msgstr "Tekst nad głową"
 
-#: ../src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Przezroczystość GUI"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Gildia"
-
-#: ../src/gui/socialwindow.cpp:143
-#, fuzzy, c-format
-msgid "Guild %s quit requested."
-msgstr "Gildia została utworzona."
-
-#: ../src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Gildia"
+#: src/gui/setup_video.cpp:260
+msgid "Ambient FX"
+msgstr "Efekty otoczenia"
 
-#: ../src/gui/socialwindow.cpp:543
+#: src/gui/setup_video.cpp:261
 #, fuzzy
-msgid "Guild Name"
-msgstr "Gildia"
-
-#: ../src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Gildia została utworzona."
+msgid "Particle detail"
+msgstr "Detale czÄ…steczek"
 
-#: ../src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
-msgstr ""
+#: src/gui/setup_video.cpp:262
+msgid "Font size"
+msgstr "Rozmiar czcionki"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
-msgid "Guild name is missing."
-msgstr "Brakuje nazwy grupy."
+msgid "None"
+msgstr "Nie"
 
-#: ../src/gui/statuswindow.cpp:203
+#: src/gui/setup_video.cpp:426
 #, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: ../src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
-
-#: ../src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "HP:"
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
 
-#: ../src/gui/charcreatedialog.cpp:74
+#: src/gui/setup_video.cpp:432
 #, fuzzy
-msgid "Hair color:"
-msgstr "Kolor włosów:"
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
 
-#: ../src/gui/charcreatedialog.cpp:77
+#: src/gui/setup_video.cpp:443
 #, fuzzy
-msgid "Hair style:"
-msgstr "Fryzura:"
+msgid "Switching to Full Screen"
+msgstr "Przełączanie na pełen ekran"
 
-#: ../src/gui/help.cpp:37
-msgid "Help"
-msgstr "Pomoc"
+#: src/gui/setup_video.cpp:444
+msgid "Restart needed for changes to take effect."
+msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
-#: ../src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Okno Pomocy"
+#: src/gui/setup_video.cpp:458
+#, fuzzy
+msgid "Changing to OpenGL"
+msgstr "Zmień na OpenGL"
 
-#: ../src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Ukryj Okna"
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "O! Co to?"
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze."
+#: src/gui/setup_video.cpp:467
+msgid "Applying change to OpenGL requires restart."
+msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
-#: ../src/commandhandler.cpp:241
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Jeżeli <kanał> nie istnieje, to zostanie utworzony."
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Podział doświadczenia wyłączony."
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Jeżeli <postać> ma spację, należy ją zapisać w cudzysłowie (\")"
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "Gdybyś nie był taki aktywny, nadal byś zrywał kwiatki."
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Jeżeli jesteś ostatnią osobą na kanale, zostanie on usunięty."
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
+#, fuzzy
+msgid "Screen Resolution Changed"
+msgstr "Zmieniono rozdzielczość ekranu"
 
-#: ../src/gui/popupmenu.cpp:108
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "Ignorowany"
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
+msgid "Restart your client for the change to take effect."
+msgstr "Uruchom ponownie twojego klienta, aby mogły zajść zmiany."
 
-#: ../src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "Ignoruj wprowadzenie 1"
+#: src/gui/setup_video.cpp:579
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "Ignoruj wprowadzenie 2"
+#: src/gui/setup_video.cpp:612
+#, fuzzy
+msgid "Particle Effect Settings Changed."
+msgstr "Zmieniono ustawienia ef. czÄ…steczek"
 
-#: ../src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Ignorowany"
+#: src/gui/setup_video.cpp:613
+msgid "Changes will take effect on map change."
+msgstr "Efekty nastÄ…piÄ… po zmianie mapy."
 
-#: ../src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorowanie przychodzących próśb o handel"
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Zdolności"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorowanie nadchodzących próśb o handel."
+#: src/gui/skilldialog.cpp:223
+msgid "Up"
+msgstr "Góra"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Info"
+#: src/gui/skilldialog.cpp:269
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Punkty umiejętności: %d"
 
-#: ../src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "Wrzuć monetę aby kontynuować."
+#: src/gui/skilldialog.cpp:351
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Punkty umiejętności: %d"
 
-#: ../src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "NiewystarczajÄ…ce HP!"
+#: src/gui/skilldialog.cpp:360
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Zdolności"
 
-#: ../src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "NiewystarczajÄ…ce SP!"
+#: src/gui/skilldialog.cpp:442
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Poziom: %d"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Inteligencja"
+#: src/gui/skilldialog.cpp:453
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Poziom: %d"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
+#: src/gui/socialwindow.cpp:126
 #, c-format
-msgid "Intelligence %+d"
-msgstr "Inteligencja %+d"
-
-#: ../src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Inteligencja:"
-
-#: ../src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
-msgstr ""
+#: src/gui/socialwindow.cpp:139
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Gildia została utworzona."
 
-#: ../src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
+#: src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
+#: src/gui/socialwindow.cpp:154
+#, c-format
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: ../src/client.cpp:1244
-#, fuzzy, c-format
-msgid "Invalid update host: %s"
-msgstr "Nieprawidłowy host aktualizacji: "
-
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inwentarz"
-
-#: ../src/keyboardconfig.cpp:72
-msgid "Inventory Window"
-msgstr "Okno Inwentarza"
-
-#: ../src/localplayer.cpp:1254
-#, fuzzy
-msgid "Inventory is full."
-msgstr "Serwer jest pełny"
-
-#: ../src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
-msgid "Invite"
-msgstr "Zaproś Użytkownika"
-
-#: ../src/gui/popupmenu.cpp:130
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|Zaproś %s aby dołączył do twojej gildii@@"
+msgid "Leave Guild?"
+msgstr "Utwórz Gildię"
 
-#: ../src/gui/popupmenu.cpp:134
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|ZaproÅ› %s do grupy@@"
-
-#: ../src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Zaproszenie wysłane."
-
-#: ../src/gui/socialwindow.cpp:128
-#, c-format
-msgid "Invited user %s to guild %s."
-msgstr ""
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Czy na pewno chcesz wyjść?"
 
-#: ../src/net/tmwa/partyhandler.cpp:335
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: ../src/net/tmwa/partyhandler.cpp:340
+#: src/gui/socialwindow.cpp:218
 #, c-format
-msgid "Inviting failed, because you can't see a player called %s."
+msgid "Party %s quit requested."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Skrót Przedmiotu %d"
-
-#: ../src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Okno Skrótów Przedmiotów"
+#: src/gui/socialwindow.cpp:232
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Zaproś użytkownika do grupy"
 
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
+#: src/gui/socialwindow.cpp:233
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
+#: src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
-msgstr ""
+#: src/gui/socialwindow.cpp:243
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Czy na pewno chcesz wyjść?"
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Podział przedmiotu wyłączony."
+#: src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Utwórz Gildię"
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Podział przedmiotu włączony."
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
+#, fuzzy
+msgid "Create Party"
+msgstr "Stwórz postać"
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "Podział przedmiotu nie jest możliwy."
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:141
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
-msgid "Item sharing unknown."
-msgstr "Podział przedmiotu włączony."
+msgid "Invite"
+msgstr "Zaproś Użytkownika"
 
-#: ../src/gui/statuswindow.cpp:234
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
-msgid "Job"
-msgstr "Praca:"
+msgid "Leave"
+msgstr "Duża"
 
-#: ../src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Praca:"
+#: src/gui/socialwindow.cpp:443
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Zaakceptowano zaproszenie od %s."
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
-#, c-format
-msgid "Job: %d"
-msgstr "Praca: %d"
+#: src/gui/socialwindow.cpp:449
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Odrzucono zaproszenie od %s."
 
-#: ../src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Dołączono do grupy."
+#: src/gui/socialwindow.cpp:462
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Zaakceptowano zaproszenie od %s."
 
-#: ../src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: src/gui/socialwindow.cpp:468
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Odrzucono zaproszenie od %s."
 
-#: ../src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Wykryto konflikt klawiszy."
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Klawiatura"
+#: src/gui/socialwindow.cpp:504
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "BÅ‚Ä…d podczas tworzenia gildii."
 
-#: ../src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Wykopanie nie powiodło się!"
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:163
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|Wykop potwora@@"
+msgid "Guild Name"
+msgstr "Gildia"
 
-#: ../src/gui/popupmenu.cpp:141
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
-msgid "Kick player"
-msgstr "Wykopanie nie powiodło się!"
+msgid "Choose your guild's name."
+msgstr "Wybierz twój serwer"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Wykopanie powiodło się!"
+#: src/gui/socialwindow.cpp:554
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
 
-#: ../src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Duża"
+#: src/gui/socialwindow.cpp:559
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: ../src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
-msgid "Leave"
-msgstr "Duża"
+msgid "Accept Guild Invite"
+msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: ../src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:576
+msgid "Received party request, but one already exists."
+msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
+
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
-msgid "Leave Guild?"
-msgstr "Utwórz Gildię"
+msgid "You have been invited you to join a party."
+msgstr "%s zaprosił ciebie, byś dołączył do grupy."
 
-#: ../src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
-msgstr ""
+#: src/gui/socialwindow.cpp:589
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: ../src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Poziom: %d"
+#: src/gui/socialwindow.cpp:597
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s zaprosił ciebie, byś dołączył do grupy."
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/socialwindow.cpp:602
 #, c-format
-msgid "Level: %d"
-msgstr "Poziom: %d"
+msgid "%s has invited you to join the %s party."
+msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: ../src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Prośba o dołączenie do kanału %s."
+#: src/gui/socialwindow.cpp:610
+msgid "Accept Party Invite"
+msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: ../src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Uderzenie Krytyczne"
+#: src/gui/socialwindow.cpp:621
+msgid "Cannot create party. You are already in a party"
+msgstr ""
 
-#: ../src/gui/userpalette.cpp:107
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "Gracz uderza Potwora"
+msgid "Party Name"
+msgstr "Grupa"
 
-#: ../src/gui/userpalette.cpp:111
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
-msgid "Local Player Miss"
-msgstr "Zapisz listÄ™ graczy"
+msgid "Choose your party's name."
+msgstr "Wybierz twój serwer"
 
-#: ../src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
+msgid "Specials"
 msgstr ""
 
-#: ../src/client.cpp:682
-#, fuzzy
-msgid "Logging in"
-msgstr "Użytkownik"
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
+#, c-format
+msgid "Level: %d"
+msgstr "Poziom: %d"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
-msgid "Login"
-msgstr "Użytkownik"
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
+#, c-format
+msgid "Money: %s"
+msgstr "PieniÄ…dze: %s"
 
-#: ../src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#: src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "HP:"
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Wygląda na to, że podano tobie twoją głowę."
+#: src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Exp:"
 
-#: ../src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Szczęście"
+#: src/gui/statuswindow.cpp:130
+msgid "MP:"
+msgstr "MP:"
 
-#: ../src/net/tmwa/generalhandler.cpp:106
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
-msgid "Luck %+d"
-msgstr "Szczęście %+d"
+msgid "Job: %d"
+msgstr "Praca: %d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Szczęście:"
+#: src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Praca:"
 
-#: ../src/gui/skilldialog.cpp:455
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Poziom: %d"
+msgid "Character points: %d"
+msgstr "Statystyki postaci w porzÄ…dku."
 
-#: ../src/gui/skilldialog.cpp:444
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Poziom: %d"
-
-#: ../src/net/tmwa/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Attack"
-msgstr "Atak M.:"
+msgid "Correction points: %d"
+msgstr "Punkty umiejętności: %d"
 
-#: ../src/net/tmwa/generalhandler.cpp:227
-#, fuzzy
-msgid "M.Defense"
-msgstr "Obrona M.:"
+#: src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Oferuj handel"
 
-#: ../src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
+#: src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Potwierdzono. Oczekiwanie..."
 
-#: ../src/resources/itemdb.cpp:56
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+#: src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Akceptuj handel"
 
-#: ../src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "MP:"
+#: src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Zaakceptowano. Oczekiwanie..."
 
-#: ../src/net/tmwa/chathandler.cpp:190
-#, fuzzy
-msgid "MVP player."
-msgstr "Gracz"
+#: src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Handel: Ty"
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
-msgid "Male"
-msgstr "Mężczyzna"
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Handel"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Mapa"
+#: src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Dodaj"
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
-msgid "Map: %s"
-msgstr "ImiÄ™: %s"
+msgid "You get %s"
+msgstr "Otrzymujesz %s"
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Maks."
+#: src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Dajesz:"
 
-#: ../src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Åšrednia"
+#: src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Zmień"
 
-#: ../src/gui/socialwindow.cpp:157
-msgid "Member Invite to Guild"
+#: src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
+"rodzaj przedmiotu w okienku."
 
-#: ../src/gui/socialwindow.cpp:236
-#, fuzzy
-msgid "Member Invite to Party"
-msgstr "/party > Zaproś użytkownika do grupy"
-
-#: ../src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Członek został pomyślnie wypromowany."
+#: src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "Nie masz wystarczającej ilości pieniędzy."
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Wiadomość"
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "ImiÄ™: %s"
 
-#: ../src/commandhandler.cpp:480
-msgid "Message closes chat."
-msgstr "Wiadomość zamyka czat."
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Aktualizacja..."
 
-#: ../src/commandhandler.cpp:493
-msgid "Message now closes chat."
-msgstr "Wiadomość od teraz zamyka czat."
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "�ączenie..."
 
-#: ../src/keyboardconfig.cpp:75
-msgid "Minimap Window"
-msgstr "Okno Minimapy"
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Graj"
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "MiniMapa"
+#: src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1 Proces aktualizacji jest niekompletny."
 
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Pudła"
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1 Jest mocno zalecane abyÅ›"
 
-#: ../src/gui/statuswindow.cpp:224
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
-msgid "Money"
-msgstr "PieniÄ…dze: %d"
-
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
-#, c-format
-msgid "Money: %s"
-msgstr "PieniÄ…dze: %s"
+msgid "##1  you try again later."
+msgstr "##1 spróbował później"
 
-#: ../src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Potwór uderza Gracza"
+#: src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Zakończono"
 
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Potwory"
+#: src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Pokazuje listę użytkowników w obecnym kanale"
 
-#: ../src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Przesuń w dół"
+#: src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Ustawia temat obecnego kanału"
 
-#: ../src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Przesuń w lewo"
+#: src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Opuszcza kanał"
 
-#: ../src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Przesuń w prawo"
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Uczyń użytkownika operatorem kanału"
 
-#: ../src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Przesuń w górę"
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Wykop użytkownika z kanału"
 
-#: ../src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Głośność muzyki"
+#: src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Komenda: /users"
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
-#, fuzzy, c-format
-msgid "Music: %s"
-msgstr "Temat: %s"
+#: src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Ta komenda pokazuje użytkowników w tym kanale."
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Komenda: /topic <wiadomość>"
 
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPC"
+#: src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Ta komenda ustawia temat na <wiadomość>."
 
-#: ../src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Nazwa"
+#: src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Komenda: /quit"
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
-msgid "Name:"
-msgstr "ImiÄ™:"
+#: src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Komenda powoduje opuszczenie obecnego kanału."
 
-#: ../src/gui/unregisterdialog.cpp:51
-#, c-format
-msgid "Name: %s"
-msgstr "ImiÄ™: %s"
+#: src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Jeżeli jesteś ostatnią osobą na kanale, zostanie on usunięty."
 
-#: ../src/gui/ministatus.cpp:157
-msgid "Need"
-msgstr ""
+#: src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Komenda: /op <ksywka>"
 
-#: ../src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Wymagany użytkownk, aby go wykopać!"
+#: src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Ta komenda uczyni <ksywka> operatorem kanału."
 
-#: ../src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
-msgstr "Wymagany użytkownik, aby przydzielić opa!"
+#: src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
+msgstr "Operatorzy kanału mogą wykopywać i dawać opy użytkownikom kanału."
 
-#: ../src/game.cpp:372
-msgid "Network Error"
-msgstr "BÅ‚Ä…d sieci"
+#: src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Komenda: /kick <ksywka>"
 
-#: ../src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutralny"
+#: src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Komenda spowoduje, iż <ksywka> opuści kanał."
 
-#: ../src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Nowy adres email jest niepoprawny"
+#: src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr "Wymagany użytkownik, aby przydzielić opa!"
 
-#: ../src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Nowe hasło jest nieprawidłowe"
+#: src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Wymagany użytkownk, aby go wykopać!"
 
-#: ../src/net/tmwa/loginhandler.cpp:92
-#, fuzzy
-msgid "New password too short."
-msgstr "Nowe hasło jest za krótkie"
+#: src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Ogłoszenie ogólne:"
 
-#: ../src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Następna"
+#: src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Ogłoszenie ogólne od %s:"
 
-#: ../src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Następna zakładka czatu"
+#: src/gui/widgets/chattab.cpp:153
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "%s szepcze: "
 
-#: ../src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Nie"
+#: src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Nie można wysłać pustego czatu!"
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
+#: src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
+#: src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Brak dostępnych serwerów gier"
-
-#: ../src/net/tmwa/generalhandler.cpp:132
-#, fuzzy
-msgid "No servers available."
-msgstr "Brak dostępnych serwerów"
+#: src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Zamyka zakładkę szeptania"
 
-#: ../src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Brak tekstu"
+#: src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Komenda: /close"
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się "
-"do lepszego miejsca."
+#: src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Komenda zamyka obecną zakładkę szeptania"
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
-msgid "None"
-msgstr "Nie"
+msgid "Command: /ignore"
+msgstr "Komenda: /przedmiot"
 
-#: ../src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Obecnie nie zapisuje."
+#: src/gui/widgets/whispertab.cpp:90
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Ta komenda wyświetla liczbę połączonych graczy."
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
-msgid "Not logged in."
-msgstr "Już zalogowany"
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Ta komenda rozpoczyna zapisywanie dziennika czatu to pliku <nazwa_pliku."
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Nie masz niczego do sprzedania."
+#: src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Stan"
 
-#: ../src/gui/setup_audio.cpp:94
-#, fuzzy
-msgid "Notice"
-msgstr "Brak tekstu"
+#: src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Skrót"
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
-msgid "OK"
-msgstr "Ok"
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Wybrano OK"
 
-#: ../src/net/manaserv/loginhandler.cpp:152
+#: src/gui/worldselectdialog.cpp:76
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Stary adres email jest niepoprawny"
+msgid "Change Login"
+msgstr "Zmień"
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
+#: src/gui/worldselectdialog.cpp:77
 #, fuzzy
-msgid "Old password incorrect."
-msgstr "Stare hasło jest nieprawidłowe"
+msgid "Choose World"
+msgstr "Wybierz twój serwer"
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr ""
+#: src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Przesuń w górę"
 
-#: ../src/net/tmwa/gamehandler.cpp:87
-#, c-format
-msgid "Online users: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Przesuń w dół"
 
-#: ../src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Przesuń w lewo"
 
-#: ../src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opcjami dla /%s sÄ… \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Przesuń w prawo"
 
-#: ../src/main.cpp:43
-msgid "Options:"
-msgstr "Opcje:"
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Atak"
 
-#: ../src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Gracz uderza Potwora"
+#: src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Namierz i Atakuj"
 
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Imiona Innych Graczy"
+#: src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Emotikonka"
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Rozmowa"
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr ""
+#: src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Zatrzymaj Atak"
 
-#: ../src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:48
 #, fuzzy
-msgid "Outfits Window"
-msgstr "Okno statusu"
-
-#: ../src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr "Tekst nad głową"
+msgid "Target Monster"
+msgstr "Namierz najbliższy cel"
 
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "WÅ‚asne ImiÄ™"
+#: src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "Namierz NPC"
 
-#: ../src/gui/setup_video.cpp:615
-#, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Zmieniono ustawienia ef. czÄ…steczek"
+#: src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Namierz Gracza"
 
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Efekty CzÄ…steczkowe"
+#: src/keyboardconfig.cpp:51
+msgid "Pickup"
+msgstr "PodnieÅ›"
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Efekty CzÄ…steczkowe"
+#: src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Ukryj Okna"
 
-#: ../src/gui/setup_video.cpp:263
-#, fuzzy
-msgid "Particle detail"
-msgstr "Detale czÄ…steczek"
+#: src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Usiądź"
 
-#: ../src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Detale czÄ…steczek"
+#: src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Zrzut ekranu"
 
-#: ../src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Efekty czÄ…steczkowe"
+#: src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Włącz/Wysłącz Handlowanie"
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Grupa"
+#: src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "Znajdź Ścieżkę do Myszy"
 
-#: ../src/gui/socialwindow.cpp:222
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
-msgid "Party %s quit requested."
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Grupa"
-
-#: ../src/gui/socialwindow.cpp:629
-#, fuzzy
-msgid "Party Name"
-msgstr "Grupa"
-
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Brakuje nazwy grupy."
-
-#: ../src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Pomyślnie utworzono grupę."
+msgid "Item Shortcut %d"
+msgstr "Skrót Przedmiotu %d"
 
-#: ../src/gui/beingpopup.cpp:76
-#, fuzzy, c-format
-msgid "Party: %s"
-msgstr "Grupa (%s)"
+#: src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Okno Pomocy"
 
-#: ../src/client.cpp:885
-#, fuzzy
-msgid "Password Change"
-msgstr "Hasło:"
+#: src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Okno statusu"
 
-#: ../src/client.cpp:886
-msgid "Password changed successfully!"
-msgstr ""
+#: src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Okno Inwentarza"
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Hasło:"
+#: src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Okno Ekwipunku"
 
-#: ../src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Hasła nie zgadzają się."
+#: src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Okno Umiejętności"
 
-#: ../src/gui/popupmenu.cpp:188
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "PodnieÅ›"
+#: src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Okno Minimapy"
 
-#: ../src/keyboardconfig.cpp:52
-msgid "Pickup"
-msgstr "PodnieÅ›"
+#: src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Okno Czatu"
 
-#: ../src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "Powiadomienie o podniesieniu"
+#: src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Okno Skrótów Przedmiotów"
 
-#: ../src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Graj"
+#: src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Okno Ustawień"
 
-#: ../src/commandhandler.cpp:545
-msgid "Player already ignored!"
-msgstr ""
+#: src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Okno diagnostyczne"
 
-#: ../src/commandhandler.cpp:554
+#: src/keyboardconfig.cpp:79
 #, fuzzy
-msgid "Player could not be ignored!"
-msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
+msgid "Social Window"
+msgstr "Okno Umiejętności"
 
-#: ../src/commandhandler.cpp:576
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
+#: src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Okno Skrótów Emotek"
 
-#: ../src/net/manaserv/charhandler.cpp:193
+#: src/keyboardconfig.cpp:81
 #, fuzzy
-msgid "Player deleted."
-msgstr "Gracz usunięty"
+msgid "Outfits Window"
+msgstr "Okno statusu"
 
-#: ../src/commandhandler.cpp:574
-msgid "Player no longer ignored!"
+#: src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
 msgstr ""
 
-#: ../src/commandhandler.cpp:552
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "Pomyślnie utworzono grupę."
-
-#: ../src/commandhandler.cpp:569
-msgid "Player wasn't ignored!"
+#: src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Gracze"
-
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Gracz uderza Potwora"
-
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
-msgid "Please distribute %d points"
-msgstr "Proszę wykorzystać %d punktów"
+msgid "Emote Shortcut %d"
+msgstr "Skrót Emotki %d"
 
-#: ../src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Proszę usunąć %d punktów"
+#: src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Przełącznik Czatu"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
-msgid "Please specify a name."
-msgstr ""
+#: src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Przewiń czat do góry"
 
-#: ../src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Proszę wpisać adres i port serwera"
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Przewiń czat w doł"
 
-#: ../src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Trucizna nie zadziałała..."
+#: src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "Poprzednia zakładka czatu"
 
-#: ../src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Port:"
+#: src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Następna zakładka czatu"
 
-#: ../src/gui/serverdialog.cpp:452
-msgid "Preparing download"
-msgstr ""
+#: src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "Wybrano OK"
 
-#: ../src/gui/chat.cpp:307
-#, fuzzy, c-format
-msgid "Present: %s; %d players are present."
-msgstr "%d graczy jest obecnych."
+#: src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Ignoruj wprowadzenie 1"
 
-#: ../src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Naciśnij OK, aby się odrodzić"
+#: src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Ignoruj wprowadzenie 2"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Naciśnij przycisk aby rozpocząć kalibrację"
+#: src/keyboardconfig.cpp:183
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Rozwiąż je, albo granie może być utrudnione."
 
-#: ../src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "Poprzednia zakładka czatu"
+#: src/localplayer.cpp:985
+msgid "Unable to pick up item."
+msgstr "Nie można podnieść przedmiotu."
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Cena: %s/ Razem: %s"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:994
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Podniosłeś %s [@@%d|%s@@]."
+msgstr[1] "Podniosłeś %s [@@%d|%s@@]."
 
-#: ../src/playerrelations.cpp:326
-msgid "Print '...'"
+#: src/main.cpp:42
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: ../src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Oferuj handel"
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Puls"
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr "Umieść wszystkie szepty w zakładkach"
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Wyjdź"
+#: src/main.cpp:47
+msgid "Options:"
+msgstr "Opcje:"
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Tęcza"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version     : Pokazuje wersjÄ™"
 
-#: ../src/gui/socialwindow.cpp:556
+#: src/main.cpp:49
 #, fuzzy
-msgid "Received guild request, but one already exists."
-msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help        : Pokazuje tÄ™ pomoc"
 
-#: ../src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : Plik konfiguracyjny do użycia"
 
-#: ../src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Zapisywanie..."
+#: src/main.cpp:51
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username    : Zaloguj z tą nazwą użytkownika"
 
-#: ../src/gui/setup_colors.cpp:108
+#: src/main.cpp:52
 #, fuzzy
-msgid "Red:"
-msgstr "Czerwony: "
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password    : Zaloguj z tym hasłem"
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
-msgid "Register"
-msgstr "Rejestruj"
+#: src/main.cpp:53
+#, fuzzy
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character   : Zaloguj z tÄ… postaciÄ…"
 
-#: ../src/gui/login.cpp:129
+#: src/main.cpp:54
 #, fuzzy
-msgid "Registration disabled"
-msgstr "Podział przedmiotu wyłączony."
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server      : Nazwa serwera logowania, lub IP"
 
-#: ../src/net/tmwa/loginhandler.cpp:165
+#: src/main.cpp:55
 #, fuzzy
-msgid "Rejected from server."
-msgstr "Odrzucony z serwera"
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port        : Port serwera logowania"
 
-#: ../src/gui/socialwindow.cpp:472
-#, fuzzy, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Odrzucono zaproszenie od %s."
+#: src/main.cpp:56
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : Użyj tego hosta aktualizacji"
 
-#: ../src/gui/socialwindow.cpp:453
-#, fuzzy, c-format
-msgid "Rejected party invite from %s."
-msgstr "Odrzucono zaproszenie od %s."
+#: src/main.cpp:57
+#, fuzzy
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default     : Wybierz domyślny serwer postaci i postać"
 
-#: ../src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Relacja"
+#: src/main.cpp:59
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Pomiń pobieranie aktualizacji"
 
-#: ../src/gui/login.cpp:60
+#: src/main.cpp:60
 #, fuzzy
-msgid "Remember username"
-msgstr "Zapamiętaj użytkownika"
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data        : Katalog, z którego załadować dane gry"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Prośba o Handel"
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir    : Katalog do użycia jako katalog domowy"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/main.cpp:62
 #, fuzzy
-msgid "Request to quit denied!"
-msgstr "Prośba o Handel"
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Plik konfiguracyjny do użycia"
 
-#: ../src/client.cpp:774
+#: src/main.cpp:63
 #, fuzzy
-msgid "Requesting characters"
-msgstr "Wybierz postać"
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir    : Katalog do użycia jako katalog domowy"
 
-#: ../src/client.cpp:858
-msgid "Requesting registration details"
-msgstr ""
+#: src/main.cpp:65
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl   : Wyłącz OpenGL dla tej sesji"
 
-#: ../src/commandhandler.cpp:436
-#, c-format
-msgid "Requesting to join channel %s."
-msgstr "Prośba o dołączenie do kanału %s."
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "JesteÅ› martwy."
 
-#: ../src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Resetuj"
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Ubolewamy, inforumując iż twoja postać została zabita w bitwie."
 
-#: ../src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Zresetuj okna"
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Już nie jesteś taki żywy."
 
-#: ../src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Skostniałe łapy ponurego żniwiarza sięgają po twoją duszę."
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "Uruchom ponownie twojego klienta, aby mogły zajść zmiany."
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Koniec gry!"
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Pobierz"
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się "
+"do lepszego miejsca."
 
-#: ../src/commandhandler.cpp:489
-msgid "Return now toggles chat."
-msgstr "Return od teraz włącza czat."
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Twój plan zniszczenia broni wrogów poprzez uderzanie o nią twoim gardłem "
+"zawiódł."
 
-#: ../src/commandhandler.cpp:480
-msgid "Return toggles chat."
-msgstr "Return włącza czat."
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze."
 
-#: ../src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Obróć drążek"
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Czy chesz zidentyfikować twoje rzeczy?"
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Niestety, ślad po tobie zaginął..."
 
-#: ../src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Unicestwiony."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Wygląda na to, że podano tobie twoją głowę."
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Znowu nawaliłeś, wrzuć swoje ciało do rur i weź sobie nowe."
+
+#: src/net/manaserv/beinghandler.cpp:323
 #, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Zmieniono rozdzielczość ekranu"
+msgid "Press OK to respawn."
+msgstr " Naciśnij OK, aby się odrodzić"
 
-#: ../src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Zrzut ekranu"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Umarłeś"
 
-#: ../src/game.cpp:333
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 #, fuzzy
-msgid "Screenshot saved as "
-msgstr "Zrzut ekranu zapisany do ~/"
+msgid "Not logged in."
+msgstr "Już zalogowany"
 
-#: ../src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Przewiń czat w doł"
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Przewiń czat do góry"
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Wygląda na to, że potrzebujesz wiecej pieniędzy... ;-)"
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Nazwa użytkownika już istnieje"
 
-#: ../src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "Wybrano OK"
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
 
-#: ../src/gui/worldselectdialog.cpp:71
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
-msgid "Select World"
-msgstr "Wybrano OK"
+msgid "Character's stats are too high."
+msgstr "Statystyki postaci w porzÄ…dku."
 
-#: ../src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Wybierz ilość przedmiotów do upuszczenia."
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Statystyki postaci w porzÄ…dku."
 
-#: ../src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
-msgstr "Wybierz ilość przedmiotów do pobrania."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: ../src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Wybierz ilość przedmiotów do podziału."
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Nieznany błąd"
 
-#: ../src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Podaj ilość rzeczy do przechowania."
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
 
-#: ../src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Wybierz ilość przedmiotów do handlu."
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Gracz usunięty"
 
-#: ../src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Sprzedaj"
-
-#: ../src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Wyślij"
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Nieznany błąd"
 
-#: ../src/gui/serverdialog.cpp:211
-#, fuzzy
-msgid "Server type:"
-msgstr "Serwer:"
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Brak dostępnych serwerów gier"
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Serwer:"
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Temat: %s"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Konfiguracja"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Gracz uderza Potwora"
 
-#: ../src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Okno Ustawień"
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Komenda: /join <kanał>"
 
-#: ../src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Głośność efektów dźwiękowych"
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Prośba o dołączenie do kanału %s."
 
-#: ../src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Sklep"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#: ../src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Skrót"
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s dołączył do grupy."
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
-msgid "Show IP: Off"
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
 msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
-msgid "Show IP: On"
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254
-#, fuzzy
-msgid "Show damage"
-msgstr "Pokaż imię"
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:232
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
-msgid "Show gender"
-msgstr "Pokaż imię"
+msgid "Unknown channel event."
+msgstr "Nieznane polecenie."
 
-#: ../src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show own name"
-msgstr "Pokaż imię"
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Gildia została utworzona."
 
-#: ../src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
-msgstr "Pokaż powiadomienie o podniesieniu"
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "BÅ‚Ä…d podczas tworzenia gildii."
 
-#: ../src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "Usiądź"
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Zaproszenie wysłane."
 
-#: ../src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Siad nieudany!"
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Członek został pomyślnie wypromowany."
 
-#: ../src/gui/skilldialog.cpp:362
-#, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Zdolności"
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Promocja Członka nie powiodła się."
 
-#: ../src/gui/skilldialog.cpp:353
-#, fuzzy, c-format
-msgid "Skill Set %d"
-msgstr "Punkty umiejętności: %d"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "ZÅ‚y magic_token"
 
-#: ../src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Okno Umiejętności"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Już zalogowany"
 
-#: ../src/gui/skilldialog.cpp:271
-#, fuzzy, c-format
-msgid "Skill points available: %d"
-msgstr "Punkty umiejętności: %d"
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Konto wygasło"
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Zdolności"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Nowe hasło jest nieprawidłowe"
 
-#: ../src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr "Miejsc:"
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Stare hasło jest nieprawidłowe"
 
-#: ../src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Mała"
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Konto niepołączone. Proszę najpierw się zalogować."
 
-#: ../src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Emotikonka"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Nowy adres email jest niepoprawny"
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
-msgid "Social"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Stary adres email jest niepoprawny"
 
-#: ../src/keyboardconfig.cpp:80
+#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "Social Window"
-msgstr "Okno Umiejętności"
+msgid "The new email address already exists."
+msgstr "Nowy Adres Email już istnieje"
 
-#: ../src/gui/setup_video.cpp:582
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:136
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Ktoś inny próbuje użyć tego konta"
-
-#: ../src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Dźwięk"
-
-#: ../src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr ""
+msgid "Client version is too old."
+msgstr "Wersja klienta jest zbyt stara"
 
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Zła nazwa użytkownika lub hasło"
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Konto wygasło"
 
-#: ../src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Widmo"
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Zła nazwa użytkownika, hasło, lub adres email"
 
-#: ../src/net/tmwa/generalhandler.cpp:142
+#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Speed hack detected."
-msgstr "Wykryto Speed hack"
+msgid "Username already exists."
+msgstr "Nazwa użytkownika już istnieje"
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
-msgid "Split"
-msgstr "Podziel"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Adres email już istnieje"
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: ../src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Rozpoczęcie zapisywania..."
-
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Statyczny"
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Dołączono do grupy."
 
-#: ../src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Stan"
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s dołączył do grupy."
 
-#: ../src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Okno statusu"
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s odmówił zaproszenia."
 
-#: ../src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Zatrzymaj"
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Akceptowanie nadchodzących próśb o handel."
 
-#: ../src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Zatrzymaj Atak"
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorowanie nadchodzących próśb o handel."
 
-#: ../src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Zatrzymaj zapisywanie"
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Prośba o Handel"
 
-#: ../src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Magazyn"
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s chce handlować z tobą, zgadzasz się?"
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
-msgid "Store"
-msgstr "Przechowaj"
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Handel z %s"
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Siła"
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Handel anulowany."
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Siła %+d"
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Handel zakończony."
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Siła:"
+#: src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Wykopanie nie powiodło się!"
 
-#: ../src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Zatwierdź"
+#: src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Wykopanie powiodło się!"
 
-#: ../src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr ""
+#: src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Nie masz niczego do sprzedania."
 
-#: ../src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Zmień postać"
+#: src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Dziękuję za kupno."
 
-#: ../src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Zmień serwer"
+#: src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Nie można kupić."
 
-#: ../src/gui/setup_video.cpp:445
-#, fuzzy
-msgid "Switching to Full Screen"
-msgstr "Przełączanie na pełen ekran"
+#: src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Dziękuję za sprzedaż."
 
-#: ../src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Rozmowa"
+#: src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Nie można sprzedać."
 
-#: ../src/gui/popupmenu.cpp:150
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@talk|Rozmawiaj z %s@@"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Namierz i Atakuj"
+#: src/net/tmwa/charserverhandler.cpp:107
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Nie można uzyć tego ID"
 
-#: ../src/keyboardconfig.cpp:49
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Target Monster"
-msgstr "Namierz najbliższy cel"
+msgid "Unknown char-server failure."
+msgstr "Nieznany błąd"
 
-#: ../src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "Namierz NPC"
+#: src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+"Utworzenie postaci nie powiodło się. Najprawdopodobniej imię jest już zajęte."
 
-#: ../src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Namierz Gracza"
+#: src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Usunięto postać."
 
-#: ../src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Tekst"
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Usunięcie gracza nie powiodło się."
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Dziękuję za kupno."
+#: src/net/tmwa/charserverhandler.cpp:266
+msgid "Strength:"
+msgstr "Siła:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Dziękuję za sprzedaż."
+#: src/net/tmwa/charserverhandler.cpp:267
+msgid "Agility:"
+msgstr "Zwinność:"
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Skostniałe łapy ponurego żniwiarza sięgają po twoją duszę."
+#: src/net/tmwa/charserverhandler.cpp:268
+msgid "Vitality:"
+msgstr "Witalność:"
 
-#: ../src/game.cpp:368
-#, fuzzy
-msgid "The connection to the server was lost."
-msgstr "Połączenie z serwerem zostało utracone, program zakończy pracę"
+#: src/net/tmwa/charserverhandler.cpp:269
+msgid "Intelligence:"
+msgstr "Inteligencja:"
 
-#: ../src/gui/changeemaildialog.cpp:141
-#, fuzzy
-msgid "The email address entries mismatch."
-msgstr "Nowy Adres Email już istnieje"
+#: src/net/tmwa/charserverhandler.cpp:270
+msgid "Dexterity:"
+msgstr "Zręczność:"
 
-#: ../src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "Nowy Adres Email już istnieje"
+#: src/net/tmwa/charserverhandler.cpp:271
+msgid "Luck:"
+msgstr "Szczęście:"
 
-#: ../src/gui/changeemaildialog.cpp:127
+#: src/net/tmwa/chathandler.cpp:87
 #, fuzzy, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Szept nie mógł zostać wysłany, użytkownik jest offline."
 
-#: ../src/gui/changeemaildialog.cpp:134
+#: src/net/tmwa/chathandler.cpp:96
 #, fuzzy, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: ../src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
+#: src/net/tmwa/chathandler.cpp:230
+#, fuzzy
+msgid "MVP player."
+msgstr "Gracz"
+
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Kanały nie są wspierane!"
+
+#: src/net/tmwa/gamehandler.cpp:88
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "Hasło musi mieć conajmniej %d znaków."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Game"
+msgstr "Nazwa"
 
-#: ../src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "Hasło nie może mieć więcej jak %d znaków."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Prośba o Handel"
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "Hasło musi mieć conajmniej %d znaków."
+msgid "Strength %+d"
+msgstr "Siła %+d"
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "Hasło nie może mieć więcej jak %d znaków."
+msgid "Agility %+d"
+msgstr "Zwinność %+d"
 
-#: ../src/gui/register.cpp:166
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
+msgid "Vitality %+d"
+msgstr "Witalność %+d"
 
-#: ../src/gui/register.cpp:174
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
-
-#: ../src/net/tmwa/generalhandler.cpp:139
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "To konto jest już zalogowane"
+msgid "Intelligence %+d"
+msgstr "Inteligencja %+d"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Komenda powoduje opuszczenie grupy przez gracza"
+#: src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Zręczność %+d"
 
-#: ../src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Komenda powoduje opuszczenie grupy przez gracza"
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
+msgstr "Szczęście %+d"
 
-#: ../src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "Komenda zmienia zasadę pozdziału doświadczenia w grupie."
+#: src/net/tmwa/generalhandler.cpp:132
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Uwierzytelnienie nie powiodło się"
 
-#: ../src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr "Komenda zmienia zasadę pozdziału przedmiotu w grupie"
+#: src/net/tmwa/generalhandler.cpp:135
+#, fuzzy
+msgid "No servers available."
+msgstr "Brak dostępnych serwerów"
 
-#: ../src/commandhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Ta komenda ustawia temat na <wiadomość>."
+msgid "Someone else is trying to use this account."
+msgstr "Ktoś inny próbuje użyć tego konta"
 
-#: ../src/commandhandler.cpp:229
-msgid "This command clears the chat log of previous chat."
-msgstr "Ta komenda czyści zawartość okna."
+#: src/net/tmwa/generalhandler.cpp:142
+#, fuzzy
+msgid "This account is already logged in."
+msgstr "To konto jest już zalogowane"
 
-#: ../src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "Komenda zamyka obecną zakładkę szeptania"
+#: src/net/tmwa/generalhandler.cpp:145
+#, fuzzy
+msgid "Speed hack detected."
+msgstr "Wykryto Speed hack"
 
-#: ../src/commandhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Te komendy utworzÄ… nowÄ… grupÄ™ nazwanÄ… <nazwa-grupy>."
+msgid "Duplicated login."
+msgstr "Zduplikowany login"
 
-#: ../src/commandhandler.cpp:210
-msgid "This command displays a list of all commands available."
-msgstr "Ta komenda wyświetla listę dostępnych komend."
+#: src/net/tmwa/generalhandler.cpp:151
+#, fuzzy
+msgid "Unknown connection error."
+msgstr "Nieznany błąd połączenia"
 
-#: ../src/commandhandler.cpp:213
-msgid "This command displays help on <command>."
-msgstr "Ta komenda wyświetla pomoc dotyczącą <komenda>"
+#: src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Rozłączono z serwerem!"
 
-#: ../src/commandhandler.cpp:324
-msgid "This command displays the name of the current map."
-msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Siła"
 
-#: ../src/commandhandler.cpp:329
-msgid "This command displays the number of players currently online."
-msgstr "Ta komenda wyświetla liczbę połączonych graczy."
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Zwinność"
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr "Komenda pokazuje obecną zasadę podziału doświadczenia w grupie."
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Witalność"
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr "Komenda pokazuje zasadę pozdziału przedmiotu w grupie."
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Inteligencja"
 
-#: ../src/commandhandler.cpp:313
-msgid "This command displays the return toggle status."
-msgstr "Ta komenda wyświetla status przełącznika"
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Zręczność"
 
-#: ../src/commandhandler.cpp:302
-msgid "This command finishes a recording session."
-msgstr "Ta komenda kończy zapisywanie sesji"
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Szczęście"
 
-#: ../src/commandhandler.cpp:292
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"Ta komenda pobiera listę graczy w zasięgu słuchu i wysyła ją do dziennika "
-"zapisu, lub dziennika czatu."
+#: src/net/tmwa/generalhandler.cpp:238
+#, fuzzy
+msgid "Defense"
+msgstr "Obrona:"
 
-#: ../src/commandhandler.cpp:234
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Ta komenda wyświetla liczbę połączonych graczy."
+msgid "M.Attack"
+msgstr "Atak M.:"
 
-#: ../src/gui/widgets/whispertab.cpp:89
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr "Ta komenda wyświetla liczbę połączonych graczy."
+msgid "M.Defense"
+msgstr "Obrona M.:"
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
+#: src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Celność:"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
+#: src/net/tmwa/generalhandler.cpp:242
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% Unik:"
 
-#: ../src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Komenda powoduje opuszczenie obecnego kanału."
+#: src/net/tmwa/generalhandler.cpp:243
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "Uderzenie Krytyczne"
 
-#: ../src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Ta komenda uczyni <ksywka> operatorem kanału."
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gildia"
 
-#: ../src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Komenda spowoduje, iż <ksywka> opuści kanał."
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Wyświetla tą pomoc"
 
-#: ../src/commandhandler.cpp:240
-msgid "This command makes you enter <channel>."
-msgstr "Ta komenda powoduje, iż wejdziesz do  <kanał>"
+#: src/net/tmwa/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Zaproszenie gracza do twojej grupy"
 
-#: ../src/commandhandler.cpp:223
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Ta komenda wysyła wiadomość <wiadomość> to wszystkich połączonych graczy."
+#: src/net/tmwa/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Opuszenie grupy, w której jesteś"
 
-#: ../src/commandhandler.cpp:258
-msgid "This command sends the text <message> to <nick>."
-msgstr "Ta komenda wysyła tekst <wiadomość> do <ksywka>"
+#: src/net/tmwa/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Wykopanie kogoś z grupy, w której jesteś"
 
-#: ../src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Ta komenda ustawia temat na <wiadomość>."
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Komenda: /invite <ksywka>"
 
-#: ../src/commandhandler.cpp:307
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Ta komenda ustawia, czy klawisz return powinien włączać dziennik zapisu, lub "
-"czy dziennik zapisu powinien się automatycznie wyłączyć."
+#: src/net/tmwa/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
 
-#: ../src/commandhandler.cpp:246
-msgid "This command shows a list of all channels."
-msgstr "Ta komenda pokazuje listę wszystkich kanałów."
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Komenda: /leave"
 
-#: ../src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Ta komenda pokazuje użytkowników w tym kanale."
+#: src/net/tmwa/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Komenda powoduje opuszczenie grupy przez gracza"
 
-#: ../src/commandhandler.cpp:299
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr ""
-"Ta komenda rozpoczyna zapisywanie dziennika czatu to pliku <nazwa_pliku."
+#: src/net/tmwa/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Brakuje nazwy grupy."
 
-#: ../src/commandhandler.cpp:318
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:95
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
 msgstr ""
-"Ta komenda rozpoczyna zapisywanie dziennika czatu to pliku <nazwa_pliku."
 
-#: ../src/commandhandler.cpp:251
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Ta komenda mówi innym co (robisz) <wiadomość>."
+#: src/net/tmwa/guildhandler.cpp:306
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s jest od teraz członkiem twojej grupy."
 
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
+#: src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
 msgstr ""
 
-#: ../src/commandhandler.cpp:266
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/net/tmwa/guildhandler.cpp:316
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Nieznana odpowiedź na zaproszenie dla %s"
+
+#: src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
 msgstr ""
-"Ta komeda próbuje utworzyć zakładkę dla prywatnych wiadomości pomiędzy tobą "
-"i <ksywka>."
 
-#: ../src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "Kolor będzie wyglądał w ten sposób"
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Grupa"
 
-#: ../src/net/tmwa/loginhandler.cpp:179
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "Ta nazwa użytkownika jest już zajęta"
+#: src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Zaproszenie gracza do twojej grupy"
 
-#: ../src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Drobna"
+#: src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Opuszenie grupy, w której jesteś"
 
-#: ../src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "Do:"
+#: src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Wykopanie kogoś z grupy, w której jesteś"
 
-#: ../src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr "Przełącznik Czatu"
+#: src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Pokaż/zmień opcje podziału przedmiotu w grupie"
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Temat: %s"
+#: src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Pokaż/zmień opcje pozdziału doświadczenia w grupie"
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Handel"
+#: src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Komenda powoduje opuszczenie grupy przez gracza"
 
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Handel anulowany."
+#: src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Komenda: /item <zasada>"
 
-#: ../src/net/tmwa/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Handel anulowany z nieznanego powodu."
+#: src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr "Komenda zmienia zasadę pozdziału przedmiotu w grupie"
 
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Handel zakończony."
+#: src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<zasada> może być jedną z \"1\", \"yes\", \"true\" aby aktywować pozdział "
+"przedmiotu lub \"0\", \"no\", \"false\" by wyłączyć podział przedmiotu."
 
-#: ../src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Handel zakończony niepowodzeniem!"
+#: src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Komenda: /przedmiot"
 
-#: ../src/net/tmwa/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Handel z %s został anulowany."
+#: src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr "Komenda pokazuje zasadę pozdziału przedmiotu w grupie."
 
-#: ../src/gui/popupmenu.cpp:83
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "Handel z %s"
+#: src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Komenda: /exp <zadada>"
 
-#: ../src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Handel: Ty"
+#: src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr "Komenda zmienia zasadę pozdziału doświadczenia w grupie."
 
-#: ../src/net/tmwa/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Handel: Ty i %s"
+#: src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<zasada> może być jedną z \"1\", \"yes\", \"true\" aby aktywować pozdział "
+"doświadczenia, lub \"0\", \"no\", \"false\" aby wyłączyć pozdział "
+"doświadczenia."
 
-#: ../src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Handlowanie nie jest możliwe. Postać nie istnieje."
+#: src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Komenda: /exp"
 
-#: ../src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Handlowanie nie jest możlwe. Kontrahent jest za daleko."
+#: src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Komenda pokazuje obecną zasadę podziału doświadczenia w grupie."
 
-#: ../src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Handel z %s"
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Podział przedmiotu włączony."
 
-#: ../src/gui/setup_video.cpp:477
-#, fuzzy
-msgid "Transparency disabled"
-msgstr "Podział doświadczenia wyłączony."
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Podział przedmiotu wyłączony."
 
-#: ../src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
-msgstr ""
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "Podział przedmiotu nie jest możliwy."
 
-#: ../src/localplayer.cpp:1251
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
-msgid "Tried to pick up nonexistent item."
-msgstr "Nie można podnieść przedmiotu."
+msgid "Item sharing unknown."
+msgstr "Podział przedmiotu włączony."
 
-#: ../src/commandhandler.cpp:335
-msgid "Type /help for a list of commands."
-msgstr "Wpisz /help aby usyskać listę komend."
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Podział doświadczenia włączony."
 
-#: ../src/gui/changeemaildialog.cpp:51
-#, fuzzy
-msgid "Type new email address twice:"
-msgstr "Wpisz dwukrotnie nowy adres email:"
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr "Podział doświadczenia wyłączony."
 
-#: ../src/gui/changepassworddialog.cpp:63
-#, fuzzy
-msgid "Type new password twice:"
-msgstr "Wpisz dwukrotnie nowe hasło:"
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "Podział doświadczenia nie jest możliwy."
 
-#: ../src/gui/setup_colors.cpp:71
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
-msgid "Type:"
-msgstr "Typ: "
+msgid "Experience sharing unknown."
+msgstr "Podział doświadczenia włączony."
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Nie można kupić."
+#: src/net/tmwa/inventoryhandler.cpp:285
+msgid "Failed to use item."
+msgstr "Użycie przedmiotu nie powiodło się."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Nie można założyć."
 
-#: ../src/net/tmwa/network.cpp:345
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Nie można sprzedać."
-
-#: ../src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Nie można sprzedać."
-
-#: ../src/net/tmwa/inventoryhandler.cpp:418
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Nie można zdjąć."
 
-#: ../src/gui/setup_keyboard.cpp:90
-#, fuzzy
-msgid "Unassign"
-msgstr "Przypisz"
-
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
-msgid "Unequip"
-msgstr "Zdejmij"
-
-#: ../src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "Zdejmij"
-
-#: ../src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "Nieobsługiwany pakiet anulowania handlu."
-
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr ""
+#: src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Nie znaleziono Konta. Proszę zalogować się ponownie."
 
-#: ../src/net/net.cpp:145
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Nieznany Typ Przedmiotu"
+msgid "New password too short."
+msgstr "Nowe hasło jest za krótkie"
 
-#: ../src/net/manaserv/chathandler.cpp:327
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
-msgid "Unknown channel event."
-msgstr "Nieznane polecenie."
+msgid "Unregistered ID."
+msgstr "Niezarejestrowany ID"
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Nieznany błąd"
-
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
-msgid "Unknown command."
-msgstr "Nieznane polecenie."
+msgid "Wrong password."
+msgstr "Nieprawidłowe hasło"
 
-#: ../src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
-msgid "Unknown connection error."
-msgstr "Nieznany błąd połączenia"
-
-#: ../src/net/manaserv/charhandler.cpp:208
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Nieznany błąd"
+msgid "Account expired."
+msgstr "Konto wygasło"
 
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
-msgid "Unknown error."
-msgstr "Nieznany błąd"
+msgid "Rejected from server."
+msgstr "Odrzucony z serwera"
 
-#: ../src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
-msgid "Unknown guild invite response."
-msgstr "Nieznana odpowiedź na zaproszenie dla %s"
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr "Zostałeś tymczasowo zbanowany. Proszę skontaktować się z zespołem GM."
 
-#: ../src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
-msgid "Unknown invite response for %s."
-msgstr "Nieznana odpowiedź na zaproszenie dla %s"
-
-#: ../src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Nieznany przedmiot"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Zostałeś tymczasowo zbanowany z gry do dnia %s.\n"
+"Proszę skontaktować się z zespołem GM poprzez forum."
 
-#: ../src/localplayer.cpp:1258
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
-msgid "Unknown problem picking up item."
-msgstr "Nie można podnieść przedmiotu."
-
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Wyrejestruj"
+msgid "This user name is already taken."
+msgstr "Ta nazwa użytkownika jest już zajęta"
 
-#: ../src/client.cpp:926
-#, fuzzy
-msgid "Unregister Successful"
-msgstr "Wyrejestruj"
+#: src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:156
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
-msgid "Unregistered ID."
-msgstr "Niezarejestrowany ID"
-
-#: ../src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Góra"
-
-#: ../src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Aktualizacja..."
-
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
-msgid "Use"
-msgstr "Użyj"
+msgid "Unable to resolve host \""
+msgstr "Nie można sprzedać."
 
-#: ../src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
-msgid "User is now part of your guild."
-msgstr "%s jest od teraz członkiem twojej grupy."
+msgid "Connection to server terminated. "
+msgstr "�ączenie z serwerem map..."
 
-#: ../src/net/tmwa/guildhandler.cpp:300
-msgid "User rejected guild invite."
-msgstr ""
+#: src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Nie można utworzyć grupy."
 
-#: ../src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Nazwa użytkownika już istnieje"
+#: src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Pomyślnie utworzono grupę."
 
-#: ../src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Obraz"
+#: src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s już jest członkiem grupy."
 
-#: ../src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Widoczne imiona"
+#: src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s odmówił zaproszenia."
 
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Witalność"
+#: src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s jest od teraz członkiem twojej grupy."
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
-msgid "Vitality %+d"
-msgstr "Witalność %+d"
+msgid "Unknown invite response for %s."
+msgstr "Nieznana odpowiedź na zaproszenie dla %s"
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Witalność:"
+#: src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Opuściłeś grupę."
 
-#: ../src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "Oczekiwanie na serwer"
+#: src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s opuścił twoją grupę."
 
-#: ../src/gui/serverdialog.cpp:448
-#, fuzzy
-msgid "Waiting for server..."
-msgstr "Oczekiwanie na serwer"
+#: src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Nieznany członek próbował powiedzieć: %s"
 
-#: ../src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "Ubolewamy, inforumując iż twoja postać została zabita w bitwie."
-
-#: ../src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Waga:"
-
-#: ../src/gui/itempopup.cpp:126
-#, fuzzy, c-format
-msgid "Weight: %s"
-msgstr "Waga: "
-
-#: ../src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "Gdy ignorowany:"
-
-#: ../src/gui/popupmenu.cpp:91
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "Szept"
-
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
+#: src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s nie jest w twojej grupie!"
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "Szept nie mógł zostać wysłany, użytkownik jest offline."
+#: src/net/tmwa/playerhandler.cpp:100
+msgid "Insert coin to continue."
+msgstr "Wrzuć monetę aby kontynuować."
 
-#: ../src/gui/chat.cpp:452
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Szepczesz do %s: %s"
+#: src/net/tmwa/playerhandler.cpp:118
+msgid "You're not dead yet. You're just resting."
+msgstr "Jeszcze nie umarłeś. Po prostu odpoczywasz."
 
-#: ../src/gui/socialwindow.cpp:158
-#, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:119
+msgid "You are no more."
+msgstr "Więcej ciebie nie ma."
 
-#: ../src/gui/socialwindow.cpp:237
-#, c-format
-msgid "Who would you like to invite to party %s?"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:120
+msgid "You have ceased to be."
+msgstr "Przestałeś istnieć."
 
-#: ../src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Siła woli:"
+#: src/net/tmwa/playerhandler.cpp:121
+msgid "You've expired and gone to meet your maker."
+msgstr "Odszedłeś na spotkanie ze swoim stwórcą."
 
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "Siła woli %+d"
+#: src/net/tmwa/playerhandler.cpp:122
+msgid "You're a stiff."
+msgstr "JesteÅ› sztywniakiem."
 
-#: ../src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "ZÅ‚y magic_token"
+#: src/net/tmwa/playerhandler.cpp:123
+msgid "Bereft of life, you rest in peace."
+msgstr "Opuściło cię życie. Teraz spoczywasz w spokoju."
 
-#: ../src/net/tmwa/loginhandler.cpp:159
-#, fuzzy
-msgid "Wrong password."
-msgstr "Nieprawidłowe hasło"
+#: src/net/tmwa/playerhandler.cpp:124
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "Gdybyś nie był taki aktywny, nadal byś zrywał kwiatki."
 
-#: ../src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Zła nazwa użytkownika lub hasło"
+#: src/net/tmwa/playerhandler.cpp:125
+msgid "Your metabolic processes are now history."
+msgstr "Twoje procesy metaboliczne sÄ… teraz historiÄ…."
 
-#: ../src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Zła nazwa użytkownika, hasło, lub adres email"
+#: src/net/tmwa/playerhandler.cpp:126
+msgid "You're off the twig."
+msgstr ""
 
-#: ../src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Tak"
+#: src/net/tmwa/playerhandler.cpp:127
+msgid "You've kicked the bucket."
+msgstr "KopnÄ…Å‚eÅ› w kalendarz."
 
-#: ../src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Umarłeś"
+#: src/net/tmwa/playerhandler.cpp:128
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "JesteÅ› ex-graczem."
 
-#: ../src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:131
+msgid "You're pining for the fjords."
+msgstr "Usychasz z tęsknoty za fiordami."
+
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
+msgid "Message"
+msgstr "Wiadomość"
+
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Nosisz więcej, niż połowa twojej wagi. Nie możesz odzyskiwać zdrowia."
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "JesteÅ› martwy."
-
-#: ../src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Więcej ciebie nie ma."
-
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Już nie jesteś taki żywy."
+#: src/net/tmwa/playerhandler.cpp:313
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Podniosłeś "
 
-#: ../src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
+#: src/net/tmwa/playerhandler.cpp:348
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "Nie możesz teraz tego zrobić!"
-
-#: ../src/net/tmwa/specialhandler.cpp:189
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Nie można użyć tej umiejętności z taką bronią!"
+#: src/net/tmwa/playerhandler.cpp:488
+msgid "Equip arrows first."
+msgstr "Najpierw załóż strzały."
 
-#: ../src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "Nie masz wystarczającej ilości pieniędzy."
+#: src/net/tmwa/specialhandler.cpp:144
+msgid "Trade failed!"
+msgstr "Handel zakończony niepowodzeniem!"
 
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
-#, fuzzy, c-format
-msgid "You get %s"
-msgstr "Otrzymujesz %s"
+#: src/net/tmwa/specialhandler.cpp:147
+msgid "Emote failed!"
+msgstr "Emotka nieudana!"
 
-#: ../src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "Dajesz:"
+#: src/net/tmwa/specialhandler.cpp:150
+msgid "Sit failed!"
+msgstr "Siad nieudany!"
 
-#: ../src/gui/socialwindow.cpp:592
-#, fuzzy, c-format
-msgid "You have been invited to join the %s party."
-msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
+#: src/net/tmwa/specialhandler.cpp:153
+msgid "Chat creating failed!"
+msgstr "Utworzenie czatu nieudane!"
 
-#: ../src/gui/socialwindow.cpp:588
-#, fuzzy
-msgid "You have been invited you to join a party."
-msgstr "%s zaprosił ciebie, byś dołączył do grupy."
+#: src/net/tmwa/specialhandler.cpp:156
+msgid "Could not join party!"
+msgstr "Nie można dołączyć do grupy!"
 
-#: ../src/net/tmwa/loginhandler.cpp:168
-#, fuzzy
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr "Zostałeś tymczasowo zbanowany. Proszę skontaktować się z zespołem GM."
+#: src/net/tmwa/specialhandler.cpp:159
+msgid "Cannot shout!"
+msgstr "Nie można krzyknąć!"
 
-#: ../src/net/tmwa/loginhandler.cpp:172
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
-msgstr ""
-"Zostałeś tymczasowo zbanowany z gry do dnia %s.\n"
-"Proszę skontaktować się z zespołem GM poprzez forum."
+#: src/net/tmwa/specialhandler.cpp:168
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Masz za niski poziom!"
 
-#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Przestałeś istnieć."
+#: src/net/tmwa/specialhandler.cpp:171
+msgid "Insufficient HP!"
+msgstr "NiewystarczajÄ…ce HP!"
 
-#: ../src/net/tmwa/partyhandler.cpp:241
-msgid "You have left the party."
-msgstr "Opuściłeś grupę."
+#: src/net/tmwa/specialhandler.cpp:174
+msgid "Insufficient SP!"
+msgstr "NiewystarczajÄ…ce SP!"
 
-#: ../src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Nie masz notatek!"
 
-#: ../src/net/tmwa/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Masz za niski poziom!"
+#: src/net/tmwa/specialhandler.cpp:180
+msgid "You cannot do that right now!"
+msgstr "Nie możesz teraz tego zrobić!"
 
-#: ../src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:183
+msgid "Seems you need more money... ;-)"
+msgstr "Wygląda na to, że potrzebujesz wiecej pieniędzy... ;-)"
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:186
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Nie można użyć tej umiejętności z taką bronią!"
 
-#: ../src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:189
+msgid "You need another red gem!"
+msgstr "Potrzebujesz innego czerwonego kamienia!"
+
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Potrzebujesz innego niebieskiego kamienia!"
 
-#: ../src/net/tmwa/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "Potrzebujesz innego czerwonego kamienia!"
+#: src/net/tmwa/specialhandler.cpp:195
+msgid "You're carrying to much to do this!"
+msgstr "Jesteś zbyt obciążony aby to zrobić!"
 
-#: ../src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
+#: src/net/tmwa/specialhandler.cpp:198
+msgid "Huh? What's that?"
+msgstr "O! Co to?"
+
+#: src/net/tmwa/specialhandler.cpp:207
+msgid "Warp failed..."
 msgstr ""
 
-#: ../src/localplayer.cpp:1276
-#, fuzzy, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Podniosłeś %s [@@%d|%s@@]."
-msgstr[1] "Podniosłeś %s [@@%d|%s@@]."
+#: src/net/tmwa/specialhandler.cpp:210
+msgid "Could not steal anything..."
+msgstr "Nie mogę nic ukraść..."
 
-#: ../src/net/tmwa/playerhandler.cpp:344
-#, fuzzy, c-format
-msgid "You picked up %s."
-msgstr "Podniosłeś "
+#: src/net/tmwa/specialhandler.cpp:213
+msgid "Poison had no effect..."
+msgstr "Trucizna nie zadziałała..."
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Znowu nawaliłeś, wrzuć swoje ciało do rur i weź sobie nowe."
+#: src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Handlowanie nie jest możlwe. Kontrahent jest za daleko."
 
-#: ../src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Handlowanie nie jest możliwe. Postać nie istnieje."
 
-#: ../src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "JesteÅ› sztywniakiem."
+#: src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Handel anulowany z nieznanego powodu."
 
-#: ../src/net/tmwa/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "Jesteś zbyt obciążony aby to zrobić!"
+#: src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Handel: Ty i %s"
 
-#: ../src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "Jeszcze nie umarłeś. Po prostu odpoczywasz."
+#: src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel z %s został anulowany."
 
-#: ../src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr "Nieobsługiwany pakiet anulowania handlu."
 
-#: ../src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr "Usychasz z tęsknoty za fiordami."
+#: src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Dodanie przedmiotu nie powiodło się. Kontrahent jest przeciążony."
 
-#: ../src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "Odszedłeś na spotkanie ze swoim stwórcą."
+#: src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+"Dodanie przedmiotu nie powiodło się. Kontrahent nie posiada wolnego miejsca."
 
-#: ../src/net/tmwa/playerhandler.cpp:136
-msgid "You've kicked the bucket."
-msgstr "KopnÄ…Å‚eÅ› w kalendarz."
+#: src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Dodanie przedmiotu nie powiodło się z nieznanego powodu."
 
-#: ../src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
+#: src/playerrelations.cpp:310
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|Kompletnie ignoruj %s@@"
+
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: ../src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "Twoje procesy metaboliczne sÄ… teraz historiÄ…."
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "Atak %+d"
 
-#: ../src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Twoje imię musi mieć conajmniej 4 znaki."
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "Obrona %+d"
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Twój plan zniszczenia broni wrogów poprzez uderzanie o nią twoim gardłem "
-"zawiódł."
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: ../src/gui/setup_video.cpp:233
-msgid "as particle"
-msgstr "jako czÄ…steczkÄ™"
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "wysokie"
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Nieznany przedmiot"
 
-#: ../src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "w czacie"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "nienazwany"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "niskie"
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr ""
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: ../src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "max"
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: ../src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "średnie"
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "PieniÄ…dze: %d"
 
-#: ../src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "wyłączone"
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Praca:"
 
-#: ../src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr ""
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Poziom: %d"
 
-#: ../src/gui/serverdialog.cpp:558
-#, c-format
-msgid "requires v%s"
-msgstr ""
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "Dostęp zabroniony"
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
-msgid "unnamed"
-msgstr "nienazwany"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Nieznany błąd podczas wyboru postaci"
 
-#~ msgid ""
-#~ "\n"
-#~ "> Cancel\n"
-#~ msgstr ""
-#~ "\n"
-#~ "> Anuluj\n"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Zapraszanie w ten sposób nie jest obecnie wspierane."
 
-#~ msgid "  -D --default    : Bypass the login process with default settings"
-#~ msgstr ""
-#~ "  -D --default    : Pomiń proces logowania z domyślnymi ustawieniami"
+#~ msgid "Willpower:"
+#~ msgstr "Siła woli:"
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " nie może być utworzony, ale nie istnieje! Kończenie."
+#~ msgid "Willpower %+d"
+#~ msgstr "Siła woli %+d"
 
-#~ msgid " cancelled"
-#~ msgstr " anulował"
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Siła woli:"
 
-#~ msgid " host: "
-#~ msgstr " host: "
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "Serwer jest pełny"
 
-#~ msgid " video mode: "
-#~ msgstr " tryb wideo: "
+#~ msgid "Text Shadow"
+#~ msgstr "Cień tekstu"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Refleks:"
+#~ msgid "Text Outline"
+#~ msgstr "Kontur Tekstu"
 
-#~ msgid "%s: %s"
-#~ msgstr "%s: %s"
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Etykiety Pasków Postępu"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Alias create"
+#~ msgid "Background"
+#~ msgstr "TÅ‚o"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 Paska HP"
+#~ msgid "Highlight"
+#~ msgstr "Podświetlenie"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 Paska HP"
+#~ msgid "Tab Highlight"
+#~ msgstr "Podświetlenie zakładki"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Bronie dwuręczne"
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Przedmiot zbyt drogi"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 Paska HP"
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Przedmiot jest założony"
 
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Wykop gracza@@"
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Atakuj %s@@"
+#~ msgid "Player"
+#~ msgstr "Gracz"
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Anuluj@@"
+#~ msgid "Whisper"
+#~ msgstr "Szept"
 
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|Lekceważ %s@@"
+#~ msgid "Is"
+#~ msgstr "Jest"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Upuść@@"
+#~ msgid "Server"
+#~ msgstr "Serwer"
 
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|Ignoruj %s@@"
+#~ msgid "Logger"
+#~ msgstr "Logger"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|PodnieÅ› %s@@"
+#~ msgid "Hyperlink"
+#~ msgstr "Hiperłącze"
 
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|PodnieÅ› %s@@"
+#~ msgid "Being"
+#~ msgstr "Byty"
 
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|Pobierz@@"
+#~ msgid "Other Players' Names"
+#~ msgstr "Imiona Innych Graczy"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Rozdziel@@"
+#~ msgid "Own Name"
+#~ msgstr "WÅ‚asne ImiÄ™"
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Zachowaj@@"
+#~ msgid "GM Names"
+#~ msgstr "Imiona GM"
 
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Handel z %s@@"
+#~ msgid "NPCs"
+#~ msgstr "NPC"
 
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Przestań Ignorować %s@@"
+#~ msgid "Monsters"
+#~ msgstr "Potwory"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Załóż@@"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Nieznany Typ Przedmiotu"
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Zdejmij@@"
+#~ msgid "Generics"
+#~ msgstr "Ogólne"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Użyj@@"
+#~ msgid "Hats"
+#~ msgstr "Kapelusze"
+
+#~ msgid "Usables"
+#~ msgstr "Użytkowe"
+
+#~ msgid "Shirts"
+#~ msgstr "Koszulki"
 
 #, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Dostęp zabroniony"
+#~ msgid "One Handed Weapons"
+#~ msgstr "Bronie jednoręczne"
 
-#~ msgid "Ammo"
-#~ msgstr "Amunicja"
+#~ msgid "Pants"
+#~ msgstr "Spodnie"
 
-#~ msgid "Arms"
-#~ msgstr "Naramienniki"
+#~ msgid "Shoes"
+#~ msgstr "Buty"
 
-#~ msgid "Attack:"
-#~ msgstr "Atak:"
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Bronie jednoręczne"
 
-#~ msgid "Axe"
-#~ msgstr "Topór"
+#~ msgid "Shields"
+#~ msgstr "Tarcze"
 
-#~ msgid "Background"
-#~ msgstr "TÅ‚o"
+#~ msgid "Rings"
+#~ msgstr "Pierścienie"
 
-#~ msgid "Bow"
-#~ msgstr "�uk"
+#~ msgid "Necklaces"
+#~ msgstr "Naszyjniki"
 
-#~ msgid "Buddy"
-#~ msgstr "Znajomy"
+#~ msgid "Arms"
+#~ msgstr "Naramienniki"
 
-#~ msgid "Buddy List"
-#~ msgstr "Lista znajomych"
+#~ msgid "Ammo"
+#~ msgstr "Amunicja"
 
-#~ msgid "Buddys"
-#~ msgstr "Znajomi"
+#~ msgid "Particle Effects"
+#~ msgstr "Efekty CzÄ…steczkowe"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Test Rzucania Zaklęcia 1"
+#~ msgid "Pickup Notification"
+#~ msgstr "Powiadomienie o podniesieniu"
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Test Rzucania Zaklęcia 2"
+#~ msgid "Exp Notification"
+#~ msgstr "Powiadomienie o Exp"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Test Rzucania Zaklęcia 3"
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Gracz uderza Potwora"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Komenda: /new <nazwa-grupy>"
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Potwór uderza Gracza"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "�ączenie z serwerem kont..."
+#~ msgid "Critical Hit"
+#~ msgstr "Uderzenie Krytyczne"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "�ączenie z serwerem postaci..."
+#~ msgid "Misses"
+#~ msgstr "Pudła"
 
-#~ msgid "Cost"
-#~ msgstr "Koszt"
+#~ msgid "HP Bar"
+#~ msgstr "Pasek HP"
 
-#~ msgid "Couldn't set "
-#~ msgstr "Nie można ustawić "
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 Paska HP"
 
-#~ msgid "Craft"
-#~ msgstr "Rrzemiosło"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 Paska HP"
 
-#~ msgid "Crafts"
-#~ msgstr "Rzemiosła"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 Paska HP"
+
+#~ msgid "no"
+#~ msgstr "nie"
+
+#~ msgid "Buddy"
+#~ msgstr "Znajomy"
+
+#~ msgid "Buddy List"
+#~ msgstr "Lista znajomych"
 
 #~ msgid "Description: %s"
 #~ msgstr "Opis: %s"
@@ -3964,235 +3822,268 @@ msgstr "nienazwany"
 #~ msgid "Effect: %s"
 #~ msgstr "Efekt: %s"
 
-#~ msgid "Emote"
-#~ msgstr "Emoty"
+#~ msgid "Previous"
+#~ msgstr "Poprzednia"
 
-#~ msgid "Emote Window"
-#~ msgstr "Okno Emotek"
+#~ msgid "New"
+#~ msgstr "Nowa"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Nie udało się przełączyć na "
+#~ msgid "Job Level: %d"
+#~ msgstr "Poziom Pracy: %d"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#~ msgid "Present: "
+#~ msgstr "Obecny: "
 
-#~ msgid "Generics"
-#~ msgstr "Ogólne"
+#~ msgid "Quit Guild"
+#~ msgstr "Opuść Gildię"
 
-#~ msgid "Guilds"
-#~ msgstr "Gildie"
+#~ msgid "Ok"
+#~ msgstr "Ok"
 
-#~ msgid "HP Bar"
-#~ msgstr "Pasek HP"
+#~ msgid "Recent:"
+#~ msgstr "Ostatni:"
 
-#~ msgid "Hats"
-#~ msgstr "Kapelusze"
+#~ msgid "Magic"
+#~ msgstr "Magia"
 
-#~ msgid "Highlight"
-#~ msgstr "Podświetlenie"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Test Rzucania Zaklęcia 1"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Hiperłącze"
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Test Rzucania Zaklęcia 2"
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Zapraszanie w ten sposób nie jest obecnie wspierane."
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Test Rzucania Zaklęcia 3"
 
-#~ msgid "Is"
-#~ msgstr "Jest"
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Bronie dwuręczne"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Przedmiot jest założony"
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Handel z %s@@"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Przedmiot zbyt drogi"
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Atakuj %s@@"
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Poziom Pracy: %d"
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Lekceważ %s@@"
 
-#~ msgid "Knife"
-#~ msgstr "Nóż"
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignoruj %s@@"
 
-#~ msgid "Logger"
-#~ msgstr "Logger"
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Przestań Ignorować %s@@"
 
-#~ msgid "Mace"
-#~ msgstr "Maczuga"
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Wykop gracza@@"
 
-#~ msgid "Magic"
-#~ msgstr "Magia"
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Anuluj@@"
 
-#~ msgid "Max level"
-#~ msgstr "Maks. poziom"
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|PodnieÅ› %s@@"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Tajemnicza umiejętność"
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Zdejmij@@"
 
-#~ msgid "NPC Number Request"
-#~ msgstr "Prośba NPC Numer"
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Załóż@@"
 
-#~ msgid "NPC Text Request"
-#~ msgstr "Tekst NPC - Prośba"
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Użyj@@"
 
-#~ msgid "Necklaces"
-#~ msgstr "Naszyjniki"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Upuść@@"
 
-#~ msgid "New"
-#~ msgstr "Nowa"
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Rozdziel@@"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Zachowaj@@"
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Bronie jednoręczne"
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Pobierz@@"
 
-#~ msgid "Pants"
-#~ msgstr "Spodnie"
+#~ msgid "Select Server"
+#~ msgstr "Wybierz serwer"
 
-#~ msgid "Party Window"
-#~ msgstr "Okno Grupy"
+#~ msgid "Failed to switch to "
+#~ msgstr "Nie udało się przełączyć na "
 
-#~ msgid "Player"
-#~ msgstr "Gracz"
+#~ msgid "windowed"
+#~ msgstr "w oknie"
 
-#~ msgid "Polearm"
-#~ msgstr "Kij"
+#~ msgid "fullscreen"
+#~ msgstr "pełny ekran"
 
-#~ msgid "Present: "
-#~ msgstr "Obecny: "
+#~ msgid "Mystery Skill"
+#~ msgstr "Tajemnicza umiejętność"
 
-#~ msgid "Previous"
-#~ msgstr "Poprzednia"
+#~ msgid "Weapons"
+#~ msgstr "Bronie"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Etykiety Pasków Postępu"
+#~ msgid "Crafts"
+#~ msgstr "Rzemiosła"
 
-#~ msgid "Quit Guild"
-#~ msgstr "Opuść Gildię"
+#~ msgid "Stats"
+#~ msgstr "Statystyki"
 
-#~ msgid "Recent:"
-#~ msgstr "Ostatni:"
+#~ msgid "Total"
+#~ msgstr "Razem"
+
+#~ msgid "Cost"
+#~ msgstr "Koszt"
+
+#~ msgid "Attack:"
+#~ msgstr "Atak:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% Refleks:"
 
 #~ msgid "Remaining Status Points: %d"
 #~ msgstr "Pozostało Punktów Statusu: %d"
 
-#~ msgid "Rings"
-#~ msgstr "Pierścienie"
+#~ msgid "Max level"
+#~ msgstr "Maks. poziom"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Opóźnienie przy przewijaniu ekranu"
+#~ msgid "curl error "
+#~ msgstr "błąd curl "
 
-#~ msgid "Scroll radius"
-#~ msgstr "Skok przy przewijaniu ekranu"
+#~ msgid " host: "
+#~ msgstr " host: "
 
-#~ msgid "Select Server"
-#~ msgstr "Wybierz serwer"
+#~ msgid "Guilds"
+#~ msgstr "Gildie"
 
-#~ msgid "Server"
-#~ msgstr "Serwer"
+#~ msgid "Buddys"
+#~ msgstr "Znajomi"
 
-#~ msgid "Shields"
-#~ msgstr "Tarcze"
+#~ msgid "Party Window"
+#~ msgstr "Okno Grupy"
 
-#~ msgid "Shirts"
-#~ msgstr "Koszulki"
+#~ msgid "Unarmed"
+#~ msgstr "Nieuzbrojony"
 
-#~ msgid "Shoes"
-#~ msgstr "Buty"
+#~ msgid "Knife"
+#~ msgstr "Nóż"
 
-#~ msgid "Shooting"
-#~ msgstr "Strzelectwo"
+#~ msgid "Sword"
+#~ msgstr "Miecz"
 
-#~ msgid "Slots: "
-#~ msgstr "Miejsc: "
+#~ msgid "Polearm"
+#~ msgstr "Kij"
 
 #~ msgid "Staff"
 #~ msgstr "Laska"
 
-#~ msgid "Stats"
-#~ msgstr "Statystyki"
+#~ msgid "Whip"
+#~ msgstr "Bat"
 
-#~ msgid "Sword"
-#~ msgstr "Miecz"
+#~ msgid "Bow"
+#~ msgstr "�uk"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Podświetlenie zakładki"
+#~ msgid "Shooting"
+#~ msgstr "Strzelectwo"
 
-#~ msgid "Text Outline"
-#~ msgstr "Kontur Tekstu"
+#~ msgid "Mace"
+#~ msgstr "Maczuga"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Cień tekstu"
+#~ msgid "Axe"
+#~ msgstr "Topór"
 
 #~ msgid "Thrown"
 #~ msgstr "Rzucana"
 
-#~ msgid "Total"
-#~ msgstr "Razem"
+#~ msgid "Craft"
+#~ msgstr "Rrzemiosło"
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Bronie jednoręczne"
+#~ msgid "Unknown Skill"
+#~ msgstr "Nieznana Umiejętność"
 
-#~ msgid "Unable to load selection.png"
-#~ msgstr "Nie można załadować selection.png"
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " nie może być utworzony, ale nie istnieje! Kończenie."
 
-#~ msgid "Unarmed"
-#~ msgstr "Nieuzbrojony"
+#~ msgid "Couldn't set "
+#~ msgstr "Nie można ustawić "
 
-#~ msgid "Unknown Skill"
-#~ msgstr "Nieznana Umiejętność"
+#~ msgid " video mode: "
+#~ msgstr " tryb wideo: "
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Nieznany błąd podczas wyboru postaci"
+#~ msgid "mana"
+#~ msgstr "mana"
+
+#~ msgid "Connecting to character server..."
+#~ msgstr "�ączenie z serwerem postaci..."
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "�ączenie z serwerem kont..."
+
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Alias create"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Komenda: /new <nazwa-grupy>"
 
 #~ msgid "Unnamed"
 #~ msgstr "Nienazwany"
 
-#~ msgid "Usables"
-#~ msgstr "Użytkowe"
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@pickup|PodnieÅ› %s@@"
 
-#~ msgid "Weapons"
-#~ msgstr "Bronie"
+#~ msgid "Scroll radius"
+#~ msgstr "Skok przy przewijaniu ekranu"
 
-#~ msgid "Whip"
-#~ msgstr "Bat"
+#~ msgid "Scroll laziness"
+#~ msgstr "Opóźnienie przy przewijaniu ekranu"
 
-#~ msgid "Whisper"
-#~ msgstr "Szept"
+#~ msgid "Save player list"
+#~ msgstr "Zapisz listÄ™ graczy"
 
-#~ msgid "Willpower:"
-#~ msgstr "Siła woli:"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "Nie można załadować selection.png"
 
-#~ msgid "curl error "
-#~ msgstr "błąd curl "
+#~ msgid "Emote"
+#~ msgstr "Emoty"
 
-#~ msgid "fullscreen"
-#~ msgstr "pełny ekran"
+#~ msgid "NPC Text Request"
+#~ msgstr "Tekst NPC - Prośba"
+
+#~ msgid "NPC Number Request"
+#~ msgstr "Prośba NPC Numer"
+
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr ""
+#~ "\n"
+#~ "> Anuluj\n"
+
+#~ msgid "skills.xml"
+#~ msgstr "skills.xml"
 
 #~ msgid "inc"
 #~ msgstr "podw."
 
-#~ msgid "items.xml"
-#~ msgstr "items.xml"
+#~ msgid "use"
+#~ msgstr "użyj"
 
-#~ msgid "mana"
-#~ msgstr "mana"
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#~ msgid "Emote Window"
+#~ msgstr "Okno Emotek"
+
+#~ msgid " cancelled"
+#~ msgstr " anulował"
 
 #~ msgid "monsters.xml"
 #~ msgstr "monsters.xml"
 
-#~ msgid "no"
-#~ msgstr "nie"
-
-#~ msgid "skills.xml"
-#~ msgstr "skills.xml"
+#~ msgid "items.xml"
+#~ msgstr "items.xml"
 
-#~ msgid "use"
-#~ msgstr "użyj"
+#~ msgid "  -D --default    : Bypass the login process with default settings"
+#~ msgstr ""
+#~ "  -D --default    : Pomiń proces logowania z domyślnymi ustawieniami"
 
-#~ msgid "windowed"
-#~ msgstr "w oknie"
+#~ msgid "Slots: "
+#~ msgstr "Miejsc: "
diff --git a/po/pt.po b/po/pt.po
index 427669e2..7d650680 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-03-05 13:28+0000\n"
 "Last-Translator: Tustiman <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -19,415 +19,361 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/npcdialog.cpp:183
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Seguinte"
-
-#: ../src/main.cpp:60
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : Desabilita OpenGL nesta sessão"
-
-#: ../src/main.cpp:58
-#, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir : Directório a ser usado como pasta inicial"
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Configuração"
 
-#: ../src/main.cpp:52
+#: src/client.cpp:679
 #, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Usa esta actualização do host"
+msgid "Connecting to server"
+msgstr "Conectando ao servidor de mapas..."
 
-#: ../src/main.cpp:46
+#: src/client.cpp:706
 #, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Ficheiro de configuração a ser usado"
+msgid "Logging in"
+msgstr "Autenticar"
 
-#: ../src/main.cpp:53
-msgid "  -D --default        : Choose default character server and character"
+#: src/client.cpp:739
+msgid "Entering game world"
 msgstr ""
 
-#: ../src/main.cpp:57
-#, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir : Directório a ser usado como pasta inicial"
-
-#: ../src/main.cpp:48
+#: src/client.cpp:804
 #, fuzzy
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Efectua login com esta senha"
+msgid "Requesting characters"
+msgstr "Seleccione um Personagem"
 
-#: ../src/main.cpp:47
+#: src/client.cpp:833
 #, fuzzy
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Efectua login com este utilizador"
+msgid "Connecting to the game server"
+msgstr "Conectando ao servidor de mapas..."
 
-#: ../src/main.cpp:49
+#: src/client.cpp:843
 #, fuzzy
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Efectua login com este personagem"
+msgid "Changing game servers"
+msgstr "Servidor"
 
-#: ../src/main.cpp:56
-#, fuzzy
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Pasta de onde os dados do jogo vão ser carregados"
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Erro"
 
-#: ../src/main.cpp:45
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help : Exibe esta ajuda"
+#: src/client.cpp:888
+msgid "Requesting registration details"
+msgstr ""
 
-#: ../src/main.cpp:51
+#: src/client.cpp:915
 #, fuzzy
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Porta do servidor de login"
+msgid "Password Change"
+msgstr "Senha:"
 
-#: ../src/main.cpp:50
-#, fuzzy
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Nome ou IP do servidor de login"
+#: src/client.cpp:916
+msgid "Password changed successfully!"
+msgstr ""
 
-#: ../src/main.cpp:55
+#: src/client.cpp:935
 #, fuzzy
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Não faz downloads de actualização"
+msgid "Email Change"
+msgstr "Modificar"
 
-#: ../src/main.cpp:44
+#: src/client.cpp:936
 #, fuzzy
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Exibe a versão"
-
-#: ../src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1 É altamente recomendado que"
-
-#: ../src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1  O processo de update está incompleto."
+msgid "Email changed successfully!"
+msgstr "Membro foi promovido com sucesso."
 
-#: ../src/gui/updatewindow.cpp:421
+#: src/client.cpp:956
 #, fuzzy
-msgid "##1  you try again later."
-msgstr "##1  você tente novamente mais tarde"
-
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Precisão:"
-
-#: ../src/net/tmwa/generalhandler.cpp:230
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "Golpe crítico"
-
-#: ../src/net/tmwa/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% Fuga:"
-
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr ""
+msgid "Unregister Successful"
+msgstr "Remover o Registo"
 
-#: ../src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
+#: src/client.cpp:957
+msgid "Farewell, come back any time..."
 msgstr ""
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:291
+#: src/client.cpp:1281
 #, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s entrou para o grupo."
-
-#: ../src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s te convidou para entrar no grupo %s."
-
-#: ../src/gui/socialwindow.cpp:561
-#, fuzzy, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s te convidou para entrar no grupo %s."
-
-#: ../src/gui/socialwindow.cpp:600
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s te convidou para entrar no seu grupo."
-
-#: ../src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: ../src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s saiu do seu grupo."
+msgid "Invalid update host: %s"
+msgstr "Host de atualização inválido: "
 
-#: ../src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#: src/client.cpp:1315 src/client.cpp:1321
+msgid "Error creating updates directory!"
+msgstr "Erro ao criar pasta de actualizações!"
 
-#: ../src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s já é membro de um grupo."
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
+msgid "Unknown command."
+msgstr "Comando desconhecido"
 
-#: ../src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s não está em seu grupo!"
+#: src/commandhandler.cpp:160
+msgid "-- Help --"
+msgstr "-- Ajuda --"
 
-#: ../src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s agora é um membro do seu grupo."
+#: src/commandhandler.cpp:161
+msgid "/help > Display this help"
+msgstr "/help > Mostra a ajuda"
 
-#: ../src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s entrou para o grupo."
+#: src/commandhandler.cpp:163
+msgid "/where > Display map name"
+msgstr "/where > Mostra o nome do mapa"
 
-#: ../src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
+#: src/commandhandler.cpp:164
+msgid "/who > Display number of online users"
+msgstr "/who > Mostra o numero de utilizadores online"
 
-#: ../src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s recusou seu convite."
+#: src/commandhandler.cpp:165
+msgid "/me > Tell something about yourself"
+msgstr "/me > Diga alguma coisa sobre si"
 
-#: ../src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s recusou seu convite."
+#: src/commandhandler.cpp:167
+msgid "/clear > Clears this window"
+msgstr "/clear > Limpa a janela"
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s quer negociar com você, você aceita?"
+#: src/commandhandler.cpp:169
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Envia uma mensagem privata a um utilizador"
 
-#: ../src/gui/widgets/chattab.cpp:152
-#, fuzzy, c-format
-msgid "%s whispers: %s"
-msgstr "%s sussurou: "
+#: src/commandhandler.cpp:170
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > nome do jogador"
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
-msgid "(empty)"
-msgstr ""
+#: src/commandhandler.cpp:171
+msgid "/w > Alias of msg"
+msgstr "/w > nome do jogador"
 
-#: ../src/commandhandler.cpp:222
-msgid "*** only available to a GM ***"
-msgstr "*** apenas para GM's ***"
+#: src/commandhandler.cpp:172
+msgid "/query > Makes a tab for private messages with another user"
+msgstr "/query > Cria um separador para mensagens privadas com outro utlizador"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
-msgid "+"
-msgstr ""
+#: src/commandhandler.cpp:174
+msgid "/q > Alias of query"
+msgstr "/q > nome da pesquisa"
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
-msgid "-"
+#: src/commandhandler.cpp:176
+msgid "/ignore > ignore a player"
 msgstr ""
 
-#: ../src/commandhandler.cpp:166
-msgid "-- Help --"
-msgstr "-- Ajuda --"
-
-#: ../src/commandhandler.cpp:201
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Anuciamento Global (Somente GM)"
-
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
+#: src/commandhandler.cpp:177
+msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: ../src/commandhandler.cpp:173
-msgid "/clear > Clears this window"
-msgstr "/clear > Limpa a janela"
+#: src/commandhandler.cpp:179
+msgid "/list > Display all public channels"
+msgstr "/list > Mostra todos os canais públicos"
 
-#: ../src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Fecha a aba de sussurros"
+#: src/commandhandler.cpp:180
+msgid "/join > Join or create a channel"
+msgstr "/join > Junte-se ou crie um canal"
 
-#: ../src/commandhandler.cpp:191
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Cria um novo grupo"
 
-#: ../src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Mostra/Modifica opções de partilha de experiência do grupo"
+#: src/commandhandler.cpp:183
+msgid "/party > Invite a user to party"
+msgstr "/party > convidar um jogadora para a equipa"
 
-#: ../src/commandhandler.cpp:167
-msgid "/help > Display this help"
-msgstr "/help > Mostra a ajuda"
+#: src/commandhandler.cpp:185
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Inicie a gravação da conversa para um ficheiro externo"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Exibe esta ajuda."
+#: src/commandhandler.cpp:187
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr "/toggle > Determina se <enter> alterna para o log de chat"
 
-#: ../src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
+#: src/commandhandler.cpp:189
+msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
+"/present > Obter lista de jogadores presentes (Envia para o log do chat. Se "
+"logando)"
 
-#: ../src/commandhandler.cpp:185
-msgid "/ignore > ignore a player"
-msgstr ""
+#: src/commandhandler.cpp:192
+msgid "/announce > Global announcement (GM only)"
+msgstr "/announce > Anuciamento Global (Somente GM)"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Convida um jogador para o seu grupo"
+#: src/commandhandler.cpp:196
+msgid "For more information, type /help <command>."
+msgstr "Para mais informações, escreva /help <command>."
 
-#: ../src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Convida um jogador para o seu grupo"
+#: src/commandhandler.cpp:200
+msgid "Command: /help"
+msgstr "Comando: /help"
 
-#: ../src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > Mostra/Muda opções de partilha de itens do grupo"
+#: src/commandhandler.cpp:201
+msgid "This command displays a list of all commands available."
+msgstr "Este comando mostra a lista de todos os comandos disponiveis"
 
-#: ../src/commandhandler.cpp:189
-msgid "/join > Join or create a channel"
-msgstr "/join > Junte-se ou crie um canal"
+#: src/commandhandler.cpp:203
+msgid "Command: /help <command>"
+msgstr "Comando: /help <command>"
 
-#: ../src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Expulsa um utilizador do canal"
+#: src/commandhandler.cpp:204
+msgid "This command displays help on <command>."
+msgstr "Exibe o conteúdo de ajuda de <command>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
-#, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Expulsa alguém do grupo em que você está"
+#: src/commandhandler.cpp:212
+msgid "Command: /announce <msg>"
+msgstr "Comando: /announce <msg>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Expulsa alguém do grupo em que você está"
+#: src/commandhandler.cpp:213
+msgid "*** only available to a GM ***"
+msgstr "*** apenas para GM's ***"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
+#: src/commandhandler.cpp:214
+msgid "This command sends the message <msg> to all players currently online."
+msgstr "Enviar mensagem <msg> para todos os jogadores conectados."
+
+#: src/commandhandler.cpp:219
+msgid "Command: /clear"
+msgstr "Comando /clear"
+
+#: src/commandhandler.cpp:220
+msgid "This command clears the chat log of previous chat."
+msgstr "Limpa os logs do chat anterior."
+
+#: src/commandhandler.cpp:224
 #, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Sai do grupo em que você está"
+msgid "Command: /ignore <player>"
+msgstr "Comando> /item <opção>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Sai do grupo em que você está"
+#: src/commandhandler.cpp:225
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Mostra o número de jogadores conectados."
 
-#: ../src/commandhandler.cpp:188
-msgid "/list > Display all public channels"
-msgstr "/list > Mostra todos os canais públicos"
+#: src/commandhandler.cpp:230
+msgid "Command: /join <channel>"
+msgstr "Comando: /join <canal>"
 
-#: ../src/commandhandler.cpp:171
-msgid "/me > Tell something about yourself"
-msgstr "/me > Diga alguma coisa sobre si"
+#: src/commandhandler.cpp:231
+msgid "This command makes you enter <channel>."
+msgstr "Este comando faz você entrar em <canal>."
 
-#: ../src/commandhandler.cpp:175
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Envia uma mensagem privata a um utilizador"
+#: src/commandhandler.cpp:232
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Se o <canal> não existe, ele será criado."
 
-#: ../src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Fazer um utilizador em operador do canal"
+#: src/commandhandler.cpp:236
+msgid "Command: /list"
+msgstr "Comando /list"
 
-#: ../src/commandhandler.cpp:192
-msgid "/party > Invite a user to party"
-msgstr "/party > convidar um jogadora para a equipa"
+#: src/commandhandler.cpp:237
+msgid "This command shows a list of all channels."
+msgstr "Mostrar uma lista de todos os canais."
 
-#: ../src/commandhandler.cpp:198
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Obter lista de jogadores presentes (Envia para o log do chat. Se "
-"logando)"
+#: src/commandhandler.cpp:241
+msgid "Command: /me <message>"
+msgstr "Comando /me <messagem>"
 
-#: ../src/commandhandler.cpp:180
-msgid "/q > Alias of query"
-msgstr "/q > nome da pesquisa"
+#: src/commandhandler.cpp:242
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Este comando diz aos outros o que eu estou (fazendo) <msg>."
 
-#: ../src/commandhandler.cpp:178
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Cria um separador para mensagens privadas com outro utlizador"
+#: src/commandhandler.cpp:246
+msgid "Command: /msg <nick> <message>"
+msgstr "Comando: /msg <nick> <mensagem>"
 
-#: ../src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Sair do canal"
+#: src/commandhandler.cpp:247
+msgid "Command: /whisper <nick> <message>"
+msgstr "Comando: /whisper <nick> <mensagem>"
 
-#: ../src/commandhandler.cpp:194
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Inicie a gravação da conversa para um ficheiro externo"
+#: src/commandhandler.cpp:248
+msgid "Command: /w <nick> <message>"
+msgstr "Comando: /w <nick> <mensagem>"
 
-#: ../src/commandhandler.cpp:196
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Determina se <enter> alterna para o log de chat"
+#: src/commandhandler.cpp:249
+msgid "This command sends the text <message> to <nick>."
+msgstr "Enviar <mensagem> para <nick>."
 
-#: ../src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Definir o tópico deste canal"
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Se <nick> possuir espaços, coloque dentro de parênteses (\")."
 
-#: ../src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+#: src/commandhandler.cpp:255
+msgid "Command: /query <nick>"
+msgstr "Comando: /query <nick>"
 
-#: ../src/commandhandler.cpp:186
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:256
+msgid "Command: /q <nick>"
+msgstr "Comando: /q <nick>"
+
+#: src/commandhandler.cpp:257
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
+"Este comando cria uma aba para mensagens confidenciais entre você e <nick>."
 
-#: ../src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Lista os utilizadores deste canal"
+#: src/commandhandler.cpp:262
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Comando: /create <nome-do-grupo>"
 
-#: ../src/commandhandler.cpp:177
-msgid "/w > Alias of msg"
-msgstr "/w > nome do jogador"
+#: src/commandhandler.cpp:263
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Estes comandos criam um novo grupo chamado <nome-do-grupo>."
 
-#: ../src/commandhandler.cpp:169
-msgid "/where > Display map name"
-msgstr "/where > Mostra o nome do mapa"
+#: src/commandhandler.cpp:267
+msgid "Command: /party <nick>"
+msgstr "Comando: /party <nick>"
 
-#: ../src/commandhandler.cpp:176
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > nome do jogador"
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Convida <nick> para uma festa com você."
 
-#: ../src/commandhandler.cpp:170
-msgid "/who > Display number of online users"
-msgstr "/who > Mostra o numero de utilizadores online"
+#: src/commandhandler.cpp:274
+msgid "Command: /present"
+msgstr "Comando: /present"
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
-msgid "<"
+#: src/commandhandler.cpp:275
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
 msgstr ""
+"Este comando obtém uma lista dos Jogadores ao alcance e a envia para o log "
+"de registo do chat ou, caso haja uma gravação em andamento, para o log de "
+"gravação."
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+#: src/commandhandler.cpp:281
+msgid "Command: /record <filename>"
+msgstr "Comando: /record <arquivo>"
+
+#: src/commandhandler.cpp:282
+msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
-"<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar partilha de "
-"experiência, ou \"0\", \"no\" e \"false\" para desabilitar."
+"Este comando inicia a gravação do registo do chat para o ficheiro "
+"<nome_do_ficheiro>."
+
+#: src/commandhandler.cpp:284
+msgid "Command: /record"
+msgstr "Comando: /record"
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/commandhandler.cpp:285
+msgid "This command finishes a recording session."
+msgstr "Este comando finaliza a sessão de gravação."
+
+#: src/commandhandler.cpp:289
+msgid "Command: /toggle <state>"
+msgstr "Comando: /toggle <estado>"
+
+#: src/commandhandler.cpp:290
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
-"<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar partilhar de "
-"itens, ou \"0\", \"no\" e \"false\" para desabilitar."
+"Este comando define se a tecla enter deve alternar para o log do chat ou se "
+"o log do chat fica oculto automaticamente."
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -435,3692 +381,3635 @@ msgstr ""
 "<estado> pode ser \"1\", \"yes\" e \"true\" para ativar ou \"0\", \"no\" e "
 "\"false\" para desactivar."
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ""
+#: src/commandhandler.cpp:295
+msgid "Command: /toggle"
+msgstr "Comando: /toggle"
 
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: src/commandhandler.cpp:296
+msgid "This command displays the return toggle status."
+msgstr "Este comando mostra o status do botão alternar."
 
-#: ../src/gui/socialwindow.cpp:566
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
-msgid "Accept Guild Invite"
-msgstr "Aceitar convite para o grupo"
+msgid "Command: /unignore <player>"
+msgstr "Comando> /item <opção>"
 
-#: ../src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Aceitar convite para o grupo"
+#: src/commandhandler.cpp:301
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:466
-#, fuzzy, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Acaitar convite de %s."
+#: src/commandhandler.cpp:306
+msgid "Command: /where"
+msgstr "Comando: /where"
 
-#: ../src/gui/socialwindow.cpp:447
-#, fuzzy, c-format
-msgid "Accepted party invite from %s."
-msgstr "Acaitar convite de %s."
+#: src/commandhandler.cpp:307
+msgid "This command displays the name of the current map."
+msgstr "Mostra o nome do mapa atual."
 
-#: ../src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Aceitando propostas de negócios"
+#: src/commandhandler.cpp:311
+msgid "Command: /who"
+msgstr "Comando: /who"
 
-#: ../src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Aceitando propostas de negócios."
+#: src/commandhandler.cpp:312
+msgid "This command displays the number of players currently online."
+msgstr "Mostra o número de jogadores conectados."
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
+#: src/commandhandler.cpp:318
+msgid "Type /help for a list of commands."
+msgstr "Digite /help para ver uma lista de comandos."
+
+#: src/commandhandler.cpp:384
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Gestão da Conta e Personagem"
+#: src/commandhandler.cpp:392
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"Não é possível  criar uma aba de sussurros para o nick \"%s\"! Ou ela já "
+"existe ou é você mesmo."
 
-#: ../src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Account banned"
-msgstr "A conta expirou"
+#: src/commandhandler.cpp:406
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Solicitando entrada no canal %s."
 
-#: ../src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Account banned."
-msgstr "A conta expirou"
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Falta o nome do grupo."
 
-#: ../src/net/tmwa/loginhandler.cpp:162
-#, fuzzy
-msgid "Account expired."
-msgstr "A conta expirou"
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
+msgid "Please specify a name."
+msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Conta não conectada. Por favor, efectue o login primeiro."
+#: src/commandhandler.cpp:450
+msgid "Return toggles chat."
+msgstr "Enter alterna para o chat."
 
-#: ../src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Conta não encontrada. Por favor, log novamente."
+#: src/commandhandler.cpp:450
+msgid "Message closes chat."
+msgstr "A mensagem fecha o chat."
 
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
-msgstr "Conta: %s"
+#: src/commandhandler.cpp:459
+msgid "Return now toggles chat."
+msgstr "Agora enter alterna para o chat."
 
-#: ../src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Adicionar"
+#: src/commandhandler.cpp:463
+msgid "Message now closes chat."
+msgstr "Agora a mensagem fecha o chat."
 
-#: ../src/gui/popupmenu.cpp:171
-#, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|Adiciona nome ao chat@@"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
+msgid "Player already ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:522
 #, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Adicionar ao chat@@"
+msgid "Player successfully ignored!"
+msgstr "Grupo criado."
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Agilidade"
+#: src/commandhandler.cpp:524
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "Impossível enviar sussurro, está ignorado pelo utilizador."
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "Agilidade %+d"
+#: src/commandhandler.cpp:539
+msgid "Player wasn't ignored!"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Agilidade:"
+#: src/commandhandler.cpp:544
+msgid "Player no longer ignored!"
+msgstr ""
 
-#: ../src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Aceitar negociação"
+#: src/commandhandler.cpp:546
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "Impossível enviar sussurro, está ignorado pelo utilizador."
 
-#: ../src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Aceita. Aguarde..."
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: ../src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "Tudo"
+#: src/game.cpp:172
+msgid "General"
+msgstr "Geral"
 
-#: ../src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Permitir trocas"
+#: src/game.cpp:342
+#, fuzzy
+msgid "Screenshot saved as "
+msgstr "Screenshot salvo em ~/"
 
-#: ../src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Permitir sussurros"
+#: src/game.cpp:347
+msgid "Saving screenshot failed!"
+msgstr "Erro ao salvar screenshot!"
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
+#: src/game.cpp:378
 #, fuzzy
-msgid "Already logged in."
-msgstr "Já está conectado"
+msgid "The connection to the server was lost."
+msgstr "Conexão com o servidor perdida, o jogo será fechado"
 
-#: ../src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Já está gravando."
+#: src/game.cpp:382
+msgid "Network Error"
+msgstr "Erro de conexão"
 
-#: ../src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Efeitos Ambientais"
+#: src/game.cpp:721
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorando propostas de negócios"
 
-#: ../src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "Efeitos Ambientais"
+#: src/game.cpp:726
+msgid "Accepting incoming trade requests"
+msgstr "Aceitando propostas de negócios"
+
+#: src/game.cpp:954
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Impossível carregar mapa"
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/game.cpp:955
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Um membro desconhecido tentou dizer: %s"
+msgid "Error while loading %s"
+msgstr "Erro ao carregar %s"
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Aniquilado."
+#: src/gui/beingpopup.cpp:76
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Grupo (%s)"
 
-#: ../src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Aplicar"
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Comprar"
 
-#: ../src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Preço: %s / Total: %s"
 
-#: ../src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
+msgid "+"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Tem a certeza que quer apagar este personagem"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
+msgid "-"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:168
-#, fuzzy, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Você tem certeza que deseja sair?"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Sair"
 
-#: ../src/gui/socialwindow.cpp:247
-#, fuzzy, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Você tem certeza que deseja sair?"
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
+msgid "Max"
+msgstr "Máximo"
 
-#: ../src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Associar"
+#: src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Loja"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Ataque"
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Vender"
+
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Alterar e-mail"
 
-#: ../src/resources/itemdb.cpp:53
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
-msgid "Attack %+d"
-msgstr "Ataque %+d"
+msgid "Account: %s"
+msgstr "Conta: %s"
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
+msgstr "Digite o novo endereço de email duas vezes:"
+
+#: src/gui/changeemaildialog.cpp:127
 #, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Ataque %+d"
+msgid "The new email address needs to be at least %d characters long."
+msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
 
-#: ../src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "Presença gravada no registo do log."
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "O nome de utilizador só pode ter %d caracteres."
 
-#: ../src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "�udio"
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "O novo endereço de email já existe."
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
+msgid "Change Password"
+msgstr "Alterar Senha"
+
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Senha:"
 
-#: ../src/net/tmwa/generalhandler.cpp:129
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
-msgid "Authentication failed."
-msgstr "Autenticação falhou"
+msgid "Type new password twice:"
+msgstr "Digite a nova senha duas vezes:"
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:100
+#: src/gui/changepassworddialog.cpp:116
 #, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|Ser amigo de %s@@"
+msgid "The new password needs to be at least %d characters long."
+msgstr "A password necessita de pelo menos %d caracteres."
 
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Ser"
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "A password só pode ter até %d caracteres."
 
-#: ../src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Sem vida, descanse em paz."
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
 
-#: ../src/playerrelations.cpp:342
-msgid "Blink name"
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Criar Personagem"
+
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Nome:"
+
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:138
-#, fuzzy
-msgid "Blue:"
-msgstr "Azul: "
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Bolhas com nomes"
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
+msgstr "Cor de Cabelo:"
 
-#: ../src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Bolhas, sem nomes"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
+msgstr "Estilo do Cabelo:"
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Comprar"
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
+msgid "Create"
+msgstr "Criar"
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Calibrar"
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "Masculino"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Cancelar"
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "Feminino"
 
-#: ../src/commandhandler.cpp:422
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"Não é possível  criar uma aba de sussurros para o nick \"%s\"! Ou ela já "
-"existe ou é você mesmo."
+msgid "Please distribute %d points"
+msgstr "Por favor distribua %d potos"
 
-#: ../src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "O seu nome necessita de pelo menos 4 caracteres"
 
-#: ../src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
+msgstr "Estatisticas da personagem OK"
 
-#: ../src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "Não é possível enviar chat vazio!"
+#: src/gui/charcreatedialog.cpp:256
+#, c-format
+msgid "Please remove %d points"
+msgstr "Por favor remova %d pontos"
 
-#: ../src/commandhandler.cpp:401
-msgid "Cannot send empty whispers!"
-msgstr ""
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Confime a remoção da personagem"
 
-#: ../src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Impossível gritar!"
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "Tem a certeza que quer apagar este personagem"
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "Não é possível usar esta ID"
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr "Gestão da Conta e Personagem"
 
-#: ../src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Modificar"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Remover o Registo"
 
-#: ../src/gui/charselectdialog.cpp:150
+#: src/gui/charselectdialog.cpp:150
 #, fuzzy
 msgid "Change Email"
 msgstr "Alterar e-mail"
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Alterar e-mail"
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Eliminar"
 
-#: ../src/gui/worldselectdialog.cpp:76
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
-msgid "Change Login"
-msgstr "Modificar"
+msgid "Choose"
+msgstr "Fechar"
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Alterar Senha"
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
+msgid "(empty)"
+msgstr ""
 
-#: ../src/gui/login.cpp:62
-#, fuzzy
-msgid "Change Server"
-msgstr "Servidor"
+#: src/gui/chat.cpp:88
+msgid "Chat"
+msgstr "Chat"
 
-#: ../src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "As mudanças terão efeito na mudança do mapa."
+#: src/gui/chat.cpp:311
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
+msgstr "%d jogadores estão presentes."
 
-#: ../src/client.cpp:813
-#, fuzzy
-msgid "Changing game servers"
-msgstr "Servidor"
+#: src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Presença gravada no registo do log."
 
-#: ../src/gui/setup_video.cpp:460
-#, fuzzy
-msgid "Changing to OpenGL"
-msgstr "Mudando OpenGL"
+#: src/gui/chat.cpp:493
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "A sussurrar para %s: %s"
 
-#: ../src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Sim"
+
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Não"
+
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
 msgstr ""
-"Operadores de canal podem expulsar e dar op a outros utilizadores do canal."
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "Não há suporte para canais!"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Personagem apagado."
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: ../src/gui/statuswindow.cpp:238
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
 #, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Estatisticas da personagem OK"
+msgid "Music: %s"
+msgstr "Tópico: %s"
 
-#: ../src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Estatisticas da personagem OK"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nome: %s"
 
-#: ../src/net/manaserv/charhandler.cpp:143
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Nome de utilizador já existe"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "MiniMapa"
 
-#: ../src/net/manaserv/charhandler.cpp:155
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Estatisticas da personagem OK"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:158
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Estatisticas da personagem OK"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Efeitos de partícula"
 
-#: ../src/gui/chat.cpp:87
-msgid "Chat"
-msgstr "Chat"
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Detalhe de partículas"
 
-#: ../src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Janela de Diálogo"
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Efeitos Ambientais"
 
-#: ../src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Falha ao criar Chat!"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Equipamento"
 
-#: ../src/gui/charselectdialog.cpp:380
-#, fuzzy
-msgid "Choose"
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
+msgid "Unequip"
+msgstr "Desequipar"
+
+#: src/gui/help.cpp:37
+msgid "Help"
+msgstr "Ajuda"
+
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
+msgid "Close"
 msgstr "Fechar"
 
-#: ../src/gui/worldselectdialog.cpp:77
-#, fuzzy
-msgid "Choose World"
-msgstr "Selecione seu servidor"
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inventário"
 
-#: ../src/gui/serverdialog.cpp:196
-#, fuzzy
-msgid "Choose Your Server"
-msgstr "Selecione seu servidor"
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Armazenamento"
 
-#: ../src/gui/socialwindow.cpp:544
-#, fuzzy
-msgid "Choose your guild's name."
-msgstr "Selecione seu servidor"
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Entradas:"
 
-#: ../src/gui/socialwindow.cpp:630
-#, fuzzy
-msgid "Choose your party's name."
-msgstr "Selecione seu servidor"
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
+msgid "Equip"
+msgstr "Equipar"
 
-#: ../src/gui/npcdialog.cpp:98
-msgid "Clear log"
-msgstr ""
+#: src/gui/inventorywindow.cpp:88
+msgid "Use"
+msgstr "Usar"
 
-#: ../src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Versão do cliente é muito antiga"
-
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
-msgid "Close"
-msgstr "Fechar"
+msgid "Drop..."
+msgstr "Largar"
 
-#: ../src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Cores"
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
+msgid "Split"
+msgstr "Dividir"
 
-#: ../src/commandhandler.cpp:221
-msgid "Command: /announce <msg>"
-msgstr "Comando: /announce <msg>"
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
 
-#: ../src/commandhandler.cpp:274
-#, fuzzy
-msgid "Command: /away"
-msgstr "Comando: /who"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
+msgstr "Peso:"
 
-#: ../src/commandhandler.cpp:271
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Comando: /w <nick> <mensagem>"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Guardar"
 
-#: ../src/commandhandler.cpp:228
-msgid "Command: /clear"
-msgstr "Comando /clear"
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Recuperar"
 
-#: ../src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Comando: /close"
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
+msgid "Drop"
+msgstr "Largar"
 
-#: ../src/commandhandler.cpp:279
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Comando: /create <nome-do-grupo>"
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
+msgid "OK"
+msgstr "OK"
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Comando: /exp"
+#: src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Tudo"
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Comando: /exp <policy>"
+#: src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Seleccionar a quantidade de itens a negociar."
 
-#: ../src/commandhandler.cpp:209
-msgid "Command: /help"
-msgstr "Comando: /help"
+#: src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Seleccionar a quantidade de itens a largar."
 
-#: ../src/commandhandler.cpp:212
-msgid "Command: /help <command>"
-msgstr "Comando: /help <command>"
+#: src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Escolha a quantidade de itens para guardar."
 
-#: ../src/gui/widgets/whispertab.cpp:88
-#, fuzzy
-msgid "Command: /ignore"
-msgstr "Comando: /item"
+#: src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Escolha a quantidade de itens para retirar."
 
-#: ../src/commandhandler.cpp:233
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Comando> /item <opção>"
+#: src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Seleccionar a quantidade de itens a dividir."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Comando: /invite <nick>"
+#: src/gui/itempopup.cpp:137
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Peso: "
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Comando: /item"
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
+msgid "Login"
+msgstr "Autenticar"
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Comando> /item <opção>"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Remember username"
+msgstr "Lembras nome de usuário"
 
-#: ../src/commandhandler.cpp:239
-msgid "Command: /join <channel>"
-msgstr "Comando: /join <canal>"
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "Registo"
 
-#: ../src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Comando: /kick <nick>"
+#: src/gui/login.cpp:62
+#, fuzzy
+msgid "Change Server"
+msgstr "Servidor"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Comando: /leave"
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Partilha de itens desabilitado."
 
-#: ../src/commandhandler.cpp:245
-msgid "Command: /list"
-msgstr "Comando /list"
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
 
-#: ../src/commandhandler.cpp:250
-msgid "Command: /me <message>"
-msgstr "Comando /me <messagem>"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Mapa"
 
-#: ../src/commandhandler.cpp:255
-msgid "Command: /msg <nick> <message>"
-msgstr "Comando: /msg <nick> <mensagem>"
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Comando: /op <nick>"
+#: src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Aguardando servidor"
 
-#: ../src/commandhandler.cpp:284
-msgid "Command: /party <nick>"
-msgstr "Comando: /party <nick>"
+#: src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Seguinte"
 
-#: ../src/commandhandler.cpp:291
-msgid "Command: /present"
-msgstr "Comando: /present"
+#: src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Enviar"
 
-#: ../src/commandhandler.cpp:265
-msgid "Command: /q <nick>"
-msgstr "Comando: /q <nick>"
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: ../src/commandhandler.cpp:264
-msgid "Command: /query <nick>"
-msgstr "Comando: /query <nick>"
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Comando: /quit"
+#: src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Reiniciar"
 
-#: ../src/commandhandler.cpp:301
-msgid "Command: /record"
-msgstr "Comando: /record"
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:208
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Seguinte"
 
-#: ../src/commandhandler.cpp:298
-msgid "Command: /record <filename>"
-msgstr "Comando: /record <arquivo>"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Para:"
 
-#: ../src/commandhandler.cpp:312
-msgid "Command: /toggle"
-msgstr "Comando: /toggle"
+#: src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Enviar"
 
-#: ../src/commandhandler.cpp:306
-msgid "Command: /toggle <state>"
-msgstr "Comando: /toggle <estado>"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
-#: ../src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Comando: /topic <mensagem>"
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
+#: src/gui/outfitwindow.cpp:70
 #, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Comando> /item <opção>"
+msgid "Unequip first"
+msgstr "Desequipar"
 
-#: ../src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Comando: /users"
+#: src/gui/popupmenu.cpp:83
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Negociando com %s"
 
-#: ../src/commandhandler.cpp:257
-msgid "Command: /w <nick> <message>"
-msgstr "Comando: /w <nick> <mensagem>"
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Ataque %+d"
 
-#: ../src/commandhandler.cpp:323
-msgid "Command: /where"
-msgstr "Comando: /where"
+#: src/gui/popupmenu.cpp:91
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Sussurrar"
 
-#: ../src/commandhandler.cpp:256
-msgid "Command: /whisper <nick> <message>"
-msgstr "Comando: /whisper <nick> <mensagem>"
+#: src/gui/popupmenu.cpp:100
+#, fuzzy, c-format
+msgid "Befriend %s"
+msgstr "@@friend|Ser amigo de %s@@"
 
-#: ../src/commandhandler.cpp:328
-msgid "Command: /who"
-msgstr "Comando: /who"
+#: src/gui/popupmenu.cpp:105
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Desconsiderado"
 
-#: ../src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Concluído"
+#: src/gui/popupmenu.cpp:108
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Ignorado"
 
-#: ../src/playerrelations.cpp:312
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Ignorar completamente %s@@"
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:117
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Ignorar completamente %s@@"
 
-#: ../src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Confime a remoção da personagem"
-
-#: ../src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Confirmar:"
-
-#: ../src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Confirmado. Aguardando..."
+#: src/gui/popupmenu.cpp:130
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
+msgstr "@@guild|Convidar %s para sua Guilda@@"
 
-#: ../src/keyboardconfig.cpp:184
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr "Corrija-os, ou o jogo irá se comportar de forma estranha."
+msgid "Invite %s to join your party"
+msgstr "@@party|Convidar %s para entrar no seu grupo@@"
 
-#: ../src/gui/serverdialog.cpp:233
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
-msgid "Connect"
-msgstr "Conectando..."
+msgid "Kick player"
+msgstr "Erro na expulsão!"
 
-#: ../src/client.cpp:655
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Conectando ao servidor de mapas..."
+#: src/gui/popupmenu.cpp:150
+#, fuzzy, c-format
+msgid "Talk to %s"
+msgstr "@@talk|Falar com %s@@"
 
-#: ../src/client.cpp:803
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
-msgid "Connecting to the game server"
-msgstr "Conectando ao servidor de mapas..."
-
-#: ../src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Conectando..."
+msgid "Kick monster"
+msgstr "@@admin-kick|Expulsar monstro@@"
 
-#: ../src/net/tmwa/network.cpp:414
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Conectando ao servidor de mapas..."
-
-#: ../src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr ""
+msgid "Add name to chat"
+msgstr "@@name|Adiciona nome ao chat@@"
 
-#: ../src/gui/statuswindow.cpp:244
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Pontos de habilidade: %d"
+msgid "Pick up %s"
+msgstr "Pegar"
 
-#: ../src/game.cpp:950
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
-msgid "Could Not Load Map"
-msgstr "Impossível carregar mapa"
+msgid "Add to chat"
+msgstr "@@chat|Adicionar ao chat@@"
 
-#: ../src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "Não foi possível criar o grupo."
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Mudar de servidor"
 
-#: ../src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
-msgstr ""
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Mudar de personagem"
 
-#: ../src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Impossível entrar no grupo!"
+#: src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Finalizando gravação."
 
-#: ../src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "Não foi possível roubar nada..."
+#: src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Não há gravação neste momento."
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Criar"
+#: src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Já está gravando."
 
-#: ../src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Criar Personagem"
+#: src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Iniciando a gravação..."
 
-#: ../src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Criar Guilda"
+#: src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Falha ao iniciar gravação."
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
-#, fuzzy
-msgid "Create Party"
-msgstr "Criar Personagem"
+#: src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Gravando..."
 
-#: ../src/gui/socialwindow.cpp:507
-#, fuzzy, c-format
-msgid "Creating guild called %s."
-msgstr "Erro ao criar guilda."
+#: src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Parar gravação"
 
-#: ../src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Confirmar:"
 
-#: ../src/gui/socialwindow.cpp:529
+#: src/gui/register.cpp:100
+msgid "Email:"
+msgstr "Email:"
+
+#: src/gui/register.cpp:166
 #, c-format
-msgid "Creating party called %s."
-msgstr ""
+msgid "The username needs to be at least %d characters long."
+msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
 
-#: ../src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "O nome de utilizador só pode ter %d caracteres."
 
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Golpe crítico"
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "A password necessita de pelo menos %d caracteres."
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+msgid "The password needs to be less than %d characters long."
+msgstr "A password só pode ter até %d caracteres."
 
-#: ../src/gui/serverdialog.cpp:234
-#, fuzzy
-msgid "Custom Server"
-msgstr "Cursor personalizado"
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "As senhas não coincidem."
 
-#: ../src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "Cursor personalizado"
+#: src/gui/serverdialog.cpp:197
+#, fuzzy
+msgid "Choose Your Server"
+msgstr "Selecione seu servidor"
 
-#: ../src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
-msgstr ""
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Servidor:"
 
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr ""
+#: src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Porta:"
 
-#: ../src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Janela de Depuração"
+#: src/gui/serverdialog.cpp:208
+#, fuzzy
+msgid "Server type:"
+msgstr "Servidor:"
 
-#: ../src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Padrão"
+#: src/gui/serverdialog.cpp:229
+#, fuzzy
+msgid "Connect"
+msgstr "Conectando..."
 
-#: ../src/net/tmwa/generalhandler.cpp:225
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
-msgid "Defense"
-msgstr "Defesa:"
+msgid "Custom Server"
+msgstr "Cursor personalizado"
+
+#: src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Por favor escreva o endereço e a porta do servidor."
 
-#: ../src/resources/itemdb.cpp:54
+#: src/gui/serverdialog.cpp:441
 #, c-format
-msgid "Defense %+d"
-msgstr "Defesa %+d"
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:93
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
-msgid "Delay:"
-msgstr "Atraso: "
+msgid "Waiting for server..."
+msgstr "Aguardando servidor"
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Eliminar"
+#: src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Destreza"
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Destreza %+d"
+msgid "requires v%s"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Destreza:"
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Som"
 
-#: ../src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:105
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "Desconsiderado"
+#: src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "�udio"
 
-#: ../src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Desconsiderado"
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Volume dos Efeitos"
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Você quer uma identificação de suas posses?"
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Volume da Música"
 
-#: ../src/gui/setup_audio.cpp:43
-msgid "Download music"
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Sem texto"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:442
-#, c-format
-msgid "Downloading server list...%2.2f%%"
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
-msgid "Drop"
-msgstr "Largar"
+#: src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "A cor se parece com isso"
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
-#, fuzzy
-msgid "Drop..."
-msgstr "Largar"
+#: src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Cores"
 
-#: ../src/net/tmwa/generalhandler.cpp:145
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
-msgid "Duplicated login."
-msgstr "Login duplicado"
+msgid "Type:"
+msgstr "Tipo: "
+
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Estática"
 
-#: ../src/client.cpp:905
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Pulsar"
+
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Arco-�ris"
+
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Espectro"
+
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
-msgid "Email Change"
-msgstr "Modificar"
+msgid "Delay:"
+msgstr "Atraso: "
 
-#: ../src/net/manaserv/loginhandler.cpp:309
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Endereço de email já existe"
+msgid "Red:"
+msgstr "Vermelho: "
 
-#: ../src/client.cpp:906
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
-msgid "Email changed successfully!"
-msgstr "Membro foi promovido com sucesso."
+msgid "Green:"
+msgstr "Verde: "
 
-#: ../src/gui/register.cpp:100
-msgid "Email:"
-msgstr "Email:"
+#: src/gui/setup_colors.cpp:139
+#, fuzzy
+msgid "Blue:"
+msgstr "Azul: "
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Atalho para Emoticon %d"
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Aplicar"
 
-#: ../src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr "Janela de atalho para Emoticons"
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Reiniciar Janelas"
 
-#: ../src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Falha no Emote!"
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Pressione o botão para começar a calibragem"
 
-#: ../src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Calibrar"
 
-#: ../src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr "Habilitar Joystick"
 
-#: ../src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Habilitar/Desabilitar Negociações"
-
-#: ../src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: ../src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr ""
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: ../src/client.cpp:715
-msgid "Entering game world"
-msgstr ""
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Parar"
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
-msgid "Equip"
-msgstr "Equipar"
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Rode o manipulo"
 
-#: ../src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
-msgstr "Equipe as flechas primeiro."
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "teclado"
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Equipamento"
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Associar"
 
-#: ../src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Equipamento"
+#: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Associar"
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "Erro"
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Padrão"
 
-#: ../src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Erro ao criar guilda."
+#: src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Conflitos nas teclas detectado."
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
-msgid "Error creating updates directory!"
-msgstr "Erro ao criar pasta de actualizações!"
+#: src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Nome"
 
-#: ../src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Comando: /join <canal>"
+#: src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Relação"
 
-#: ../src/gui/serverdialog.cpp:456
-msgid "Error retreiving server list!"
-msgstr ""
+#: src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutro"
 
-#: ../src/game.cpp:951
-#, c-format
-msgid "Error while loading %s"
-msgstr "Erro ao carregar %s"
+#: src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Amigo"
 
-#: ../src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
+#: src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Desconsiderado"
 
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "Aviso de experiência"
+#: src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Ignorado"
 
-#: ../src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "Exp:"
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
+msgid "???"
+msgstr "???"
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr "Partilha de experiência desabilitado."
+#: src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Permitir trocas"
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr "Partilha de experiência habilitado."
+#: src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Permitir sussurros"
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr "Não é possível partilhar experiência."
+#: src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Deixar todos os sussurros em abas"
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
+#: src/gui/setup_players.cpp:233
 #, fuzzy
-msgid "Experience sharing unknown."
-msgstr "Partilha de experiência habilitado."
+msgid "Show gender"
+msgstr "Mostrar nome"
 
-#: ../src/gui/setup_video.cpp:238
+#: src/gui/setup_players.cpp:235
 #, fuzzy
-msgid "FPS limit:"
-msgstr "Limite de FPS:"
-
-#: ../src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Erro ao adicionar item devido a um motivo desconhecido."
+msgid "Enable Chat log"
+msgstr "Impossibilitado de vender."
 
-#: ../src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
+#: src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Jogadores"
 
-#: ../src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
+#: src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "Quando ignorado:"
 
-#: ../src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Falha ao adicionar item. Você não pode duplicar um tipo de item na janela."
+#: src/gui/setup_video.cpp:134
+msgid "Tiny"
+msgstr "Minúscula"
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
+#: src/gui/setup_video.cpp:135
+msgid "Small"
+msgstr "Pequeno"
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "Falha ao apagar personagem."
+#: src/gui/setup_video.cpp:136
+msgid "Medium"
+msgstr "Médio"
 
-#: ../src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Erro ao promover membro."
+#: src/gui/setup_video.cpp:137
+msgid "Large"
+msgstr "Grande"
 
-#: ../src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "Falha ao enviar como remetente ou a carta é inválida."
+#: src/gui/setup_video.cpp:163
+msgid "No text"
+msgstr "Sem texto"
 
-#: ../src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Falha ao iniciar gravação."
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "texto"
 
-#: ../src/gui/setup_video.cpp:434
-#, fuzzy
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "modo e restauração do antigo modo também falharam!"
+#: src/gui/setup_video.cpp:165
+msgid "Bubbles, no names"
+msgstr "Bolhas, sem nomes"
 
-#: ../src/gui/setup_video.cpp:428
-#, fuzzy
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "modo e restauração do antigo modo também falharam!"
+#: src/gui/setup_video.cpp:166
+msgid "Bubbles with names"
+msgstr "Bolhas com nomes"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
-msgid "Failed to use item."
-msgstr "Problemas ao usar item."
+#: src/gui/setup_video.cpp:178
+msgid "off"
+msgstr "desligado"
 
-#: ../src/client.cpp:927
-msgid "Farewell, come back any time..."
-msgstr ""
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
+msgid "low"
+msgstr "baixo"
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
-msgid "Female"
-msgstr "Feminino"
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
+msgid "high"
+msgstr "elevado"
 
-#: ../src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr ""
+#: src/gui/setup_video.cpp:193
+msgid "medium"
+msgstr "médio"
 
-#: ../src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Finalizando gravação."
+#: src/gui/setup_video.cpp:195
+msgid "max"
+msgstr "máximo"
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:217
+msgid "Full screen"
+msgstr "Ecrã completo"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:218
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Tamanho da fonte"
+#: src/gui/setup_video.cpp:219
+msgid "Custom cursor"
+msgstr "Cursor personalizado"
 
-#: ../src/commandhandler.cpp:205
-msgid "For more information, type /help <command>."
-msgstr "Para mais informações, escreva /help <command>."
+#: src/gui/setup_video.cpp:221
+msgid "Visible names"
+msgstr "Nomes visíveis"
 
-#: ../src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Amigo"
+#: src/gui/setup_video.cpp:223
+msgid "Particle effects"
+msgstr "Efeitos de partícula"
 
-#: ../src/gui/setup_video.cpp:219
-msgid "Full screen"
-msgstr "Ecrã completo"
+#: src/gui/setup_video.cpp:225
+#, fuzzy
+msgid "Show own name"
+msgstr "Mostrar nome"
 
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "Nomes dos GMs"
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
 
-#: ../src/net/tmwa/gamehandler.cpp:101
-#, fuzzy
-msgid "Game"
-msgstr "Nome"
+#: src/gui/setup_video.cpp:227
+msgid "Show pickup notification"
+msgstr "Mostrar aviso de achado"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Fim de jogo!"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
+msgid "in chat"
+msgstr "no chat"
 
-#: ../src/game.cpp:169
-msgid "General"
-msgstr "Geral"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
+msgid "as particle"
+msgstr "como partícula"
 
-#: ../src/gui/widgets/chattab.cpp:126
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Anúncio geral de %s:"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "FPS limit:"
+msgstr "Limite de FPS:"
 
-#: ../src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Anúncio geral:"
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
-msgstr "Você foi desconectado do servidor!"
+#: src/gui/setup_video.cpp:250
+msgid "Video"
+msgstr "Vídeo"
 
-#: ../src/gui/setup_colors.cpp:123
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Green:"
-msgstr "Verde: "
+msgid "Show damage"
+msgstr "Mostrar nome"
+
+#: src/gui/setup_video.cpp:258
+msgid "Overhead text"
+msgstr "Texto sobrescrito"
 
-#: ../src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Opacidade do Interface"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Guilda"
-
-#: ../src/gui/socialwindow.cpp:143
-#, fuzzy, c-format
-msgid "Guild %s quit requested."
-msgstr "Guilda criada."
-
-#: ../src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Guilda"
+#: src/gui/setup_video.cpp:260
+msgid "Ambient FX"
+msgstr "Efeitos Ambientais"
 
-#: ../src/gui/socialwindow.cpp:543
+#: src/gui/setup_video.cpp:261
 #, fuzzy
-msgid "Guild Name"
-msgstr "Guilda"
-
-#: ../src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Guilda criada."
+msgid "Particle detail"
+msgstr "Detalhe de partículas"
 
-#: ../src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
-msgstr ""
+#: src/gui/setup_video.cpp:262
+msgid "Font size"
+msgstr "Tamanho da fonte"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
-msgid "Guild name is missing."
-msgstr "Falta o nome do grupo."
+msgid "None"
+msgstr "Não"
 
-#: ../src/gui/statuswindow.cpp:203
+#: src/gui/setup_video.cpp:426
 #, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: ../src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
-
-#: ../src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "HP:"
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "modo e restauração do antigo modo também falharam!"
 
-#: ../src/gui/charcreatedialog.cpp:74
+#: src/gui/setup_video.cpp:432
 #, fuzzy
-msgid "Hair color:"
-msgstr "Cor de Cabelo:"
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr "modo e restauração do antigo modo também falharam!"
 
-#: ../src/gui/charcreatedialog.cpp:77
+#: src/gui/setup_video.cpp:443
 #, fuzzy
-msgid "Hair style:"
-msgstr "Estilo do Cabelo:"
+msgid "Switching to Full Screen"
+msgstr "Mudar para ecrã completo"
 
-#: ../src/gui/help.cpp:37
-msgid "Help"
-msgstr "Ajuda"
+#: src/gui/setup_video.cpp:444
+msgid "Restart needed for changes to take effect."
+msgstr "É necessário reiniciar para as alterações terem efeito."
 
-#: ../src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Ajuda"
+#: src/gui/setup_video.cpp:458
+#, fuzzy
+msgid "Changing to OpenGL"
+msgstr "Mudando OpenGL"
 
-#: ../src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Esconder Janelas"
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Hã? O que é isso?"
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Eu acho que isso não correu lá muito bem."
+#: src/gui/setup_video.cpp:467
+msgid "Applying change to OpenGL requires restart."
+msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
 
-#: ../src/commandhandler.cpp:241
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Se o <canal> não existe, ele será criado."
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Partilha de experiência desabilitado."
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Se <nick> possuir espaços, coloque dentro de parênteses (\")."
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "Se não fosse tão animado, estaria comendo grama pela raiz."
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Se você for a última pessoa no canal, ele será apagado."
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
+#, fuzzy
+msgid "Screen Resolution Changed"
+msgstr "Resolução de tela alterada"
 
-#: ../src/gui/popupmenu.cpp:108
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "Ignorado"
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
+msgid "Restart your client for the change to take effect."
+msgstr "Reincie o jogo para que as mudanças surtam efeito."
 
-#: ../src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "Ignorar input 1"
+#: src/gui/setup_video.cpp:579
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "Ignorar input 2"
+#: src/gui/setup_video.cpp:612
+#, fuzzy
+msgid "Particle Effect Settings Changed."
+msgstr "Configurações de efeito de partícula modificadas."
 
-#: ../src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Ignorado"
+#: src/gui/setup_video.cpp:613
+msgid "Changes will take effect on map change."
+msgstr "As mudanças terão efeito na mudança do mapa."
 
-#: ../src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorando propostas de negócios"
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Competências"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorando propostas de negócios."
+#: src/gui/skilldialog.cpp:223
+msgid "Up"
+msgstr "Para cima"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Info"
+#: src/gui/skilldialog.cpp:269
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Pontos de habilidade: %d"
 
-#: ../src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "Insira uma moeda para continuar."
+#: src/gui/skilldialog.cpp:351
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Pontos de habilidade: %d"
 
-#: ../src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "HP insuficiente!"
+#: src/gui/skilldialog.cpp:360
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Competências"
 
-#: ../src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "SP insuficiente!"
+#: src/gui/skilldialog.cpp:442
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Nível: %d"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Inteligência"
+#: src/gui/skilldialog.cpp:453
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Nível: %d"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
+#: src/gui/socialwindow.cpp:126
 #, c-format
-msgid "Intelligence %+d"
-msgstr "Inteligência %+d"
-
-#: ../src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Inteligência:"
-
-#: ../src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
-msgstr ""
+#: src/gui/socialwindow.cpp:139
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Guilda criada."
 
-#: ../src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
+#: src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
+#: src/gui/socialwindow.cpp:154
+#, c-format
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: ../src/client.cpp:1244
-#, fuzzy, c-format
-msgid "Invalid update host: %s"
-msgstr "Host de atualização inválido: "
-
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inventário"
-
-#: ../src/keyboardconfig.cpp:72
-msgid "Inventory Window"
-msgstr "Janela de inventário"
-
-#: ../src/localplayer.cpp:1254
-#, fuzzy
-msgid "Inventory is full."
-msgstr "Servidor cheio"
-
-#: ../src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
-msgid "Invite"
-msgstr "Convidar Usuário"
-
-#: ../src/gui/popupmenu.cpp:130
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|Convidar %s para sua Guilda@@"
+msgid "Leave Guild?"
+msgstr "Criar Guilda"
 
-#: ../src/gui/popupmenu.cpp:134
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|Convidar %s para entrar no seu grupo@@"
-
-#: ../src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Convite enviado."
-
-#: ../src/gui/socialwindow.cpp:128
-#, c-format
-msgid "Invited user %s to guild %s."
-msgstr ""
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Você tem certeza que deseja sair?"
 
-#: ../src/net/tmwa/partyhandler.cpp:335
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > convidar um jogadora para a equipa"
 
-#: ../src/net/tmwa/partyhandler.cpp:340
+#: src/gui/socialwindow.cpp:218
 #, c-format
-msgid "Inviting failed, because you can't see a player called %s."
+msgid "Party %s quit requested."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Atalho para Item %d"
-
-#: ../src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Janela de atalhos para itens"
+#: src/gui/socialwindow.cpp:232
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > convidar um jogadora para a equipa"
 
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
+#: src/gui/socialwindow.cpp:233
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
+#: src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
-msgstr ""
+#: src/gui/socialwindow.cpp:243
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Você tem certeza que deseja sair?"
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Partilha de itens desabilitado."
+#: src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Criar Guilda"
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Partilha de itens habilitado."
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
+#, fuzzy
+msgid "Create Party"
+msgstr "Criar Personagem"
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "Não é possível partilhar itens."
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:141
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
-msgid "Item sharing unknown."
-msgstr "Partilha de itens habilitado."
+msgid "Invite"
+msgstr "Convidar Usuário"
 
-#: ../src/gui/statuswindow.cpp:234
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
-msgid "Job"
-msgstr "Trabalho:"
+msgid "Leave"
+msgstr "Grande"
 
-#: ../src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Trabalho:"
+#: src/gui/socialwindow.cpp:443
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Acaitar convite de %s."
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
-#, c-format
-msgid "Job: %d"
-msgstr "Trabalho: %d"
+#: src/gui/socialwindow.cpp:449
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Rejeitar convite de %s."
 
-#: ../src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Entrou para o grupo."
+#: src/gui/socialwindow.cpp:462
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Acaitar convite de %s."
 
-#: ../src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: src/gui/socialwindow.cpp:468
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Rejeitar convite de %s."
 
-#: ../src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Conflitos nas teclas detectado."
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "teclado"
+#: src/gui/socialwindow.cpp:504
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Erro ao criar guilda."
 
-#: ../src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Erro na expulsão!"
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:163
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|Expulsar monstro@@"
+msgid "Guild Name"
+msgstr "Guilda"
 
-#: ../src/gui/popupmenu.cpp:141
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
-msgid "Kick player"
-msgstr "Erro na expulsão!"
+msgid "Choose your guild's name."
+msgstr "Selecione seu servidor"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Expulsão bem sucedida!"
+#: src/gui/socialwindow.cpp:554
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: ../src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Grande"
+#: src/gui/socialwindow.cpp:559
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s te convidou para entrar no grupo %s."
 
-#: ../src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
-msgid "Leave"
-msgstr "Grande"
+msgid "Accept Guild Invite"
+msgstr "Aceitar convite para o grupo"
+
+#: src/gui/socialwindow.cpp:576
+msgid "Received party request, but one already exists."
+msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: ../src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
-msgid "Leave Guild?"
-msgstr "Criar Guilda"
+msgid "You have been invited you to join a party."
+msgstr "%s te convidou para entrar no seu grupo."
 
-#: ../src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
-msgstr ""
+#: src/gui/socialwindow.cpp:589
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s te convidou para entrar no grupo %s."
 
-#: ../src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Nível: %d"
+#: src/gui/socialwindow.cpp:597
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s te convidou para entrar no seu grupo."
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/socialwindow.cpp:602
 #, c-format
-msgid "Level: %d"
-msgstr "Nível: %d"
+msgid "%s has invited you to join the %s party."
+msgstr "%s te convidou para entrar no grupo %s."
 
-#: ../src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Solicitando entrada no canal %s."
+#: src/gui/socialwindow.cpp:610
+msgid "Accept Party Invite"
+msgstr "Aceitar convite para o grupo"
 
-#: ../src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Golpe crítico"
+#: src/gui/socialwindow.cpp:621
+msgid "Cannot create party. You are already in a party"
+msgstr ""
 
-#: ../src/gui/userpalette.cpp:107
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "Jogador acerta monstro"
+msgid "Party Name"
+msgstr "Festa"
 
-#: ../src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
+#: src/gui/socialwindow.cpp:627
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Selecione seu servidor"
 
-#: ../src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
+msgid "Specials"
 msgstr ""
 
-#: ../src/client.cpp:682
-#, fuzzy
-msgid "Logging in"
-msgstr "Autenticar"
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
+#, c-format
+msgid "Level: %d"
+msgstr "Nível: %d"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
-msgid "Login"
-msgstr "Autenticar"
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
+#, c-format
+msgid "Money: %s"
+msgstr "Dinheiro: %s"
 
-#: ../src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#: src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "HP:"
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Parece que te ofereceram sua própria cabeça."
+#: src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Exp:"
 
-#: ../src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Sorte"
+#: src/gui/statuswindow.cpp:130
+msgid "MP:"
+msgstr "MP:"
 
-#: ../src/net/tmwa/generalhandler.cpp:106
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
-msgid "Luck %+d"
-msgstr "Sorte %+d"
+msgid "Job: %d"
+msgstr "Trabalho: %d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Sorte:"
+#: src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Trabalho:"
 
-#: ../src/gui/skilldialog.cpp:455
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Nível: %d"
+msgid "Character points: %d"
+msgstr "Estatisticas da personagem OK"
 
-#: ../src/gui/skilldialog.cpp:444
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Nível: %d"
-
-#: ../src/net/tmwa/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Attack"
-msgstr "M. Ataque:"
+msgid "Correction points: %d"
+msgstr "Pontos de habilidade: %d"
 
-#: ../src/net/tmwa/generalhandler.cpp:227
-#, fuzzy
-msgid "M.Defense"
-msgstr "M. Defesa:"
+#: src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Propor Negócio"
 
-#: ../src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
+#: src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Confirmado. Aguardando..."
 
-#: ../src/resources/itemdb.cpp:56
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+#: src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Aceitar negociação"
 
-#: ../src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "MP:"
+#: src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Aceita. Aguarde..."
 
-#: ../src/net/tmwa/chathandler.cpp:190
-#, fuzzy
-msgid "MVP player."
-msgstr "Jogador"
+#: src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Negócio: você"
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
-msgid "Male"
-msgstr "Masculino"
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Negócio"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Mapa"
+#: src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Adicionar"
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Nome: %s"
+msgid "You get %s"
+msgstr "Você obteve %s"
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Máximo"
+#: src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Dá:"
 
-#: ../src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Médio"
+#: src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Modificar"
 
-#: ../src/gui/socialwindow.cpp:157
-msgid "Member Invite to Guild"
+#: src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"Falha ao adicionar item. Você não pode duplicar um tipo de item na janela."
 
-#: ../src/gui/socialwindow.cpp:236
-#, fuzzy
-msgid "Member Invite to Party"
-msgstr "/party > convidar um jogadora para a equipa"
-
-#: ../src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Membro foi promovido com sucesso."
+#: src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "Você não tem dinheiro suficiente."
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Mensagem"
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Nome: %s"
 
-#: ../src/commandhandler.cpp:480
-msgid "Message closes chat."
-msgstr "A mensagem fecha o chat."
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Atualizando..."
 
-#: ../src/commandhandler.cpp:493
-msgid "Message now closes chat."
-msgstr "Agora a mensagem fecha o chat."
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Conectando..."
 
-#: ../src/keyboardconfig.cpp:75
-msgid "Minimap Window"
-msgstr "Janela de Mini-mapa"
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Iniciar"
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "MiniMapa"
+#: src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1  O processo de update está incompleto."
 
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Falhas"
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1 É altamente recomendado que"
 
-#: ../src/gui/statuswindow.cpp:224
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
-msgid "Money"
-msgstr "Dinheiro: %d"
+msgid "##1  you try again later."
+msgstr "##1  você tente novamente mais tarde"
 
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
-#, c-format
-msgid "Money: %s"
-msgstr "Dinheiro: %s"
+#: src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Concluído"
 
-#: ../src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Monstro acerta jogador"
+#: src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Lista os utilizadores deste canal"
 
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Monstros"
+#: src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Definir o tópico deste canal"
 
-#: ../src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Mover para Baixo"
+#: src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Sair do canal"
 
-#: ../src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Mover para Esquerda"
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Fazer um utilizador em operador do canal"
 
-#: ../src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Mover para Direita"
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Expulsa um utilizador do canal"
 
-#: ../src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Mover para Cima"
+#: src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Comando: /users"
 
-#: ../src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Volume da Música"
+#: src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Mostrar usuários do canal."
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
-#, fuzzy, c-format
-msgid "Music: %s"
-msgstr "Tópico: %s"
+#: src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Comando: /topic <mensagem>"
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Define <mensagem> como o tópico."
 
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPCs"
+#: src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Comando: /quit"
 
-#: ../src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Nome"
+#: src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Sair do canal."
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Nome:"
+#: src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Se você for a última pessoa no canal, ele será apagado."
 
-#: ../src/gui/unregisterdialog.cpp:51
-#, c-format
-msgid "Name: %s"
-msgstr "Nome: %s"
+#: src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Comando: /op <nick>"
 
-#: ../src/gui/ministatus.cpp:157
-msgid "Need"
+#: src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Tornar <nick> operador do canal."
+
+#: src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
+"Operadores de canal podem expulsar e dar op a outros utilizadores do canal."
 
-#: ../src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "É preciso um utilizador para expulsar!"
+#: src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Comando: /kick <nick>"
+
+#: src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Retirar <nick> do canal."
 
-#: ../src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr "É preciso um utilizador para dar op!"
 
-#: ../src/game.cpp:372
-msgid "Network Error"
-msgstr "Erro de conexão"
-
-#: ../src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutro"
-
-#: ../src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Novo endereço de email incorrecto"
-
-#: ../src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Nova senha incorreta"
+#: src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "É preciso um utilizador para expulsar!"
 
-#: ../src/net/tmwa/loginhandler.cpp:92
-#, fuzzy
-msgid "New password too short."
-msgstr "Nova senha é muito curta"
+#: src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Anúncio geral:"
 
-#: ../src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Seguinte"
+#: src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Anúncio geral de %s:"
 
-#: ../src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Próxima aba de chat"
+#: src/gui/widgets/chattab.cpp:153
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "%s sussurou: "
 
-#: ../src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Não"
+#: src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Não é possível enviar chat vazio!"
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
+#: src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
+#: src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Não há gameservers disponíveis."
-
-#: ../src/net/tmwa/generalhandler.cpp:132
-#, fuzzy
-msgid "No servers available."
-msgstr "Não há servidores disponíveis"
+#: src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Fecha a aba de sussurros"
 
-#: ../src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Sem texto"
+#: src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Comando: /close"
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Não, crianças. Seu personagem não morreu de verdade. Ele... err... foi para "
-"um lugar melhor."
+#: src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Este comando fecha a atual aba de sussurros"
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
-msgid "None"
-msgstr "Não"
+msgid "Command: /ignore"
+msgstr "Comando: /item"
 
-#: ../src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Não há gravação neste momento."
+#: src/gui/widgets/whispertab.cpp:90
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Mostra o número de jogadores conectados."
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
-msgid "Not logged in."
-msgstr "Já está conectado"
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Este comando inicia a gravação do registo do chat para o ficheiro "
+"<nome_do_ficheiro>."
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Nada para vender."
+#: src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Estado"
 
-#: ../src/gui/setup_audio.cpp:94
-#, fuzzy
-msgid "Notice"
-msgstr "Sem texto"
+#: src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Atalho"
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
-msgid "OK"
-msgstr "OK"
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Seleccionar OK"
 
-#: ../src/net/manaserv/loginhandler.cpp:152
+#: src/gui/worldselectdialog.cpp:76
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Antigo endereço de email incorrecto"
+msgid "Change Login"
+msgstr "Modificar"
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
+#: src/gui/worldselectdialog.cpp:77
 #, fuzzy
-msgid "Old password incorrect."
-msgstr "Senha antiga incorreta"
+msgid "Choose World"
+msgstr "Selecione seu servidor"
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr ""
+#: src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Mover para Cima"
 
-#: ../src/net/tmwa/gamehandler.cpp:87
-#, c-format
-msgid "Online users: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Mover para Baixo"
 
-#: ../src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Mover para Esquerda"
 
-#: ../src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+#: src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Mover para Direita"
 
-#: ../src/main.cpp:43
-msgid "Options:"
-msgstr "Opções:"
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Ataque"
 
-#: ../src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Jogador acerta monstro"
+#: src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Selecionar & Atacar"
 
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Nomes de outros jogadores"
+#: src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Emoticons"
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Falar"
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr ""
+#: src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Parar ataque"
 
-#: ../src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:48
 #, fuzzy
-msgid "Outfits Window"
-msgstr "Status"
-
-#: ../src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr "Texto sobrescrito"
-
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Nome Próprio"
+msgid "Target Monster"
+msgstr "Seleccionar o mais próximo"
 
-#: ../src/gui/setup_video.cpp:615
-#, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Configurações de efeito de partícula modificadas."
+#: src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "Seleccionar NPC"
 
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Efeitos de partícula"
+#: src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Seleccionar Jogador"
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Efeitos de partícula"
+#: src/keyboardconfig.cpp:51
+msgid "Pickup"
+msgstr "Pegar"
 
-#: ../src/gui/setup_video.cpp:263
-#, fuzzy
-msgid "Particle detail"
-msgstr "Detalhe de partículas"
+#: src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Esconder Janelas"
 
-#: ../src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Detalhe de partículas"
+#: src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Sentar"
 
-#: ../src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Efeitos de partícula"
+#: src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Captura de Ecrã"
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Festa"
+#: src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Habilitar/Desabilitar Negociações"
 
-#: ../src/gui/socialwindow.cpp:222
-#, c-format
-msgid "Party %s quit requested."
+#: src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
 msgstr ""
 
-#: ../src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Festa"
-
-#: ../src/gui/socialwindow.cpp:629
-#, fuzzy
-msgid "Party Name"
-msgstr "Festa"
-
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Falta o nome do grupo."
-
-#: ../src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Grupo criado."
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Atalho para Item %d"
 
-#: ../src/gui/beingpopup.cpp:76
-#, fuzzy, c-format
-msgid "Party: %s"
-msgstr "Grupo (%s)"
+#: src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Ajuda"
 
-#: ../src/client.cpp:885
-#, fuzzy
-msgid "Password Change"
-msgstr "Senha:"
+#: src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Status"
 
-#: ../src/client.cpp:886
-msgid "Password changed successfully!"
-msgstr ""
+#: src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Janela de inventário"
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Senha:"
+#: src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Equipamento"
 
-#: ../src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "As senhas não coincidem."
+#: src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Janela de Habilidade"
 
-#: ../src/gui/popupmenu.cpp:188
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "Pegar"
+#: src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Janela de Mini-mapa"
 
-#: ../src/keyboardconfig.cpp:52
-msgid "Pickup"
-msgstr "Pegar"
+#: src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Janela de Diálogo"
 
-#: ../src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "Aviso de achado"
+#: src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Janela de atalhos para itens"
 
-#: ../src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Iniciar"
+#: src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Configuração"
 
-#: ../src/commandhandler.cpp:545
-msgid "Player already ignored!"
-msgstr ""
+#: src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Janela de Depuração"
 
-#: ../src/commandhandler.cpp:554
+#: src/keyboardconfig.cpp:79
 #, fuzzy
-msgid "Player could not be ignored!"
-msgstr "Impossível enviar sussurro, está ignorado pelo utilizador."
+msgid "Social Window"
+msgstr "Janela de Habilidade"
 
-#: ../src/commandhandler.cpp:576
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "Impossível enviar sussurro, está ignorado pelo utilizador."
+#: src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Janela de atalho para Emoticons"
 
-#: ../src/net/manaserv/charhandler.cpp:193
+#: src/keyboardconfig.cpp:81
 #, fuzzy
-msgid "Player deleted."
-msgstr "Personagem apagado."
+msgid "Outfits Window"
+msgstr "Status"
 
-#: ../src/commandhandler.cpp:574
-msgid "Player no longer ignored!"
+#: src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
 msgstr ""
 
-#: ../src/commandhandler.cpp:552
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "Grupo criado."
-
-#: ../src/commandhandler.cpp:569
-msgid "Player wasn't ignored!"
+#: src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Jogadores"
-
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Jogador acerta monstro"
-
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
-msgid "Please distribute %d points"
-msgstr "Por favor distribua %d potos"
+msgid "Emote Shortcut %d"
+msgstr "Atalho para Emoticon %d"
 
-#: ../src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Por favor remova %d pontos"
+#: src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Alternar para chat"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
-msgid "Please specify a name."
-msgstr ""
+#: src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Rolar janela de chat para cima"
 
-#: ../src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Por favor escreva o endereço e a porta do servidor."
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Rolar janela de chat para baixo"
 
-#: ../src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Veneno não surtiu efeito..."
+#: src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "Aba de chat anterior"
 
-#: ../src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Porta:"
+#: src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Próxima aba de chat"
 
-#: ../src/gui/serverdialog.cpp:452
-msgid "Preparing download"
-msgstr ""
+#: src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "Seleccionar OK"
 
-#: ../src/gui/chat.cpp:307
-#, fuzzy, c-format
-msgid "Present: %s; %d players are present."
-msgstr "%d jogadores estão presentes."
+#: src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Ignorar input 1"
 
-#: ../src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Clique em OK para re-popular."
+#: src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Ignorar input 2"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Pressione o botão para começar a calibragem"
+#: src/keyboardconfig.cpp:183
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Corrija-os, ou o jogo irá se comportar de forma estranha."
 
-#: ../src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "Aba de chat anterior"
+#: src/localplayer.cpp:985
+msgid "Unable to pick up item."
+msgstr "Impossível pegar item."
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Preço: %s / Total: %s"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:994
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Você pegou %s [@@%d|%s@@]."
+msgstr[1] "Você pegou %s [@@%d|%s@@]."
 
-#: ../src/playerrelations.cpp:326
-msgid "Print '...'"
+#: src/main.cpp:42
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: ../src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Propor Negócio"
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Pulsar"
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr "Deixar todos os sussurros em abas"
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Sair"
+#: src/main.cpp:47
+msgid "Options:"
+msgstr "Opções:"
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Arco-�ris"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version : Exibe a versão"
 
-#: ../src/gui/socialwindow.cpp:556
+#: src/main.cpp:49
 #, fuzzy
-msgid "Received guild request, but one already exists."
-msgstr "Requisição de grupo recebida, mas já existe um."
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help : Exibe esta ajuda"
 
-#: ../src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr "Requisição de grupo recebida, mas já existe um."
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : Ficheiro de configuração a ser usado"
 
-#: ../src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Gravando..."
+#: src/main.cpp:51
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username : Efectua login com este utilizador"
 
-#: ../src/gui/setup_colors.cpp:108
+#: src/main.cpp:52
 #, fuzzy
-msgid "Red:"
-msgstr "Vermelho: "
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password : Efectua login com esta senha"
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
-msgid "Register"
-msgstr "Registo"
+#: src/main.cpp:53
+#, fuzzy
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character : Efectua login com este personagem"
 
-#: ../src/gui/login.cpp:129
+#: src/main.cpp:54
 #, fuzzy
-msgid "Registration disabled"
-msgstr "Partilha de itens desabilitado."
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server : Nome ou IP do servidor de login"
 
-#: ../src/net/tmwa/loginhandler.cpp:165
+#: src/main.cpp:55
 #, fuzzy
-msgid "Rejected from server."
-msgstr "Rejeitado pelo servidor"
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port : Porta do servidor de login"
 
-#: ../src/gui/socialwindow.cpp:472
-#, fuzzy, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Rejeitar convite de %s."
+#: src/main.cpp:56
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : Usa esta actualização do host"
 
-#: ../src/gui/socialwindow.cpp:453
-#, fuzzy, c-format
-msgid "Rejected party invite from %s."
-msgstr "Rejeitar convite de %s."
+#: src/main.cpp:57
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Relação"
+#: src/main.cpp:59
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Não faz downloads de actualização"
 
-#: ../src/gui/login.cpp:60
+#: src/main.cpp:60
 #, fuzzy
-msgid "Remember username"
-msgstr "Lembras nome de usuário"
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data : Pasta de onde os dados do jogo vão ser carregados"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Proposta de negociação"
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir : Directório a ser usado como pasta inicial"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/main.cpp:62
 #, fuzzy
-msgid "Request to quit denied!"
-msgstr "Proposta de negociação"
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Ficheiro de configuração a ser usado"
 
-#: ../src/client.cpp:774
+#: src/main.cpp:63
 #, fuzzy
-msgid "Requesting characters"
-msgstr "Seleccione um Personagem"
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir : Directório a ser usado como pasta inicial"
 
-#: ../src/client.cpp:858
-msgid "Requesting registration details"
-msgstr ""
+#: src/main.cpp:65
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl : Desabilita OpenGL nesta sessão"
 
-#: ../src/commandhandler.cpp:436
-#, c-format
-msgid "Requesting to join channel %s."
-msgstr "Solicitando entrada no canal %s."
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Você está morto."
 
-#: ../src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Reiniciar"
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Lamentamos informar que seu personagem foi morto em combate."
 
-#: ../src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Reiniciar Janelas"
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Você não está mais vivo."
 
-#: ../src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr "É necessário reiniciar para as alterações terem efeito."
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "As mãos frias da morte estão levando sua alma."
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "Reincie o jogo para que as mudanças surtam efeito."
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Fim de jogo!"
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Recuperar"
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Não, crianças. Seu personagem não morreu de verdade. Ele... err... foi para "
+"um lugar melhor."
 
-#: ../src/commandhandler.cpp:489
-msgid "Return now toggles chat."
-msgstr "Agora enter alterna para o chat."
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Seu plano de quebrar as armas de seus inimigos com o seu pescoço não deu "
+"certo."
 
-#: ../src/commandhandler.cpp:480
-msgid "Return toggles chat."
-msgstr "Enter alterna para o chat."
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Eu acho que isso não correu lá muito bem."
 
-#: ../src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Rode o manipulo"
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Você quer uma identificação de suas posses?"
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Infelizmente, seus vestigios nunca foram encontrados..."
 
-#: ../src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Erro ao salvar screenshot!"
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Aniquilado."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Parece que te ofereceram sua própria cabeça."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro."
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
+#: src/net/manaserv/beinghandler.cpp:323
 #, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Resolução de tela alterada"
+msgid "Press OK to respawn."
+msgstr " Clique em OK para re-popular."
 
-#: ../src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Captura de Ecrã"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Você morreu"
 
-#: ../src/game.cpp:333
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 #, fuzzy
-msgid "Screenshot saved as "
-msgstr "Screenshot salvo em ~/"
+msgid "Not logged in."
+msgstr "Já está conectado"
 
-#: ../src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Rolar janela de chat para baixo"
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Rolar janela de chat para cima"
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Parece que você precisa de mais dinheiro... ;-)"
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Nome de utilizador já existe"
 
-#: ../src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "Seleccionar OK"
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
 
-#: ../src/gui/worldselectdialog.cpp:71
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
-msgid "Select World"
-msgstr "Seleccionar OK"
+msgid "Character's stats are too high."
+msgstr "Estatisticas da personagem OK"
 
-#: ../src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Seleccionar a quantidade de itens a largar."
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Estatisticas da personagem OK"
 
-#: ../src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
-msgstr "Escolha a quantidade de itens para retirar."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: ../src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Seleccionar a quantidade de itens a dividir."
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Erro desconhecido"
 
-#: ../src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Escolha a quantidade de itens para guardar."
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
 
-#: ../src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Seleccionar a quantidade de itens a negociar."
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Personagem apagado."
 
-#: ../src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Seleccionar a quantidade de itens a negociar."
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Vender"
-
-#: ../src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Enviar"
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Erro desconhecido"
 
-#: ../src/gui/serverdialog.cpp:211
-#, fuzzy
-msgid "Server type:"
-msgstr "Servidor:"
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Não há gameservers disponíveis."
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Servidor:"
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Tópico: %s"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Configuração"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Jogador acerta monstro"
 
-#: ../src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Configuração"
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Comando: /join <canal>"
 
-#: ../src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Volume dos Efeitos"
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Solicitando entrada no canal %s."
 
-#: ../src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Loja"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#: ../src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Atalho"
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s entrou para o grupo."
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
-msgid "Show IP: Off"
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
 msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
-msgid "Show IP: On"
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254
-#, fuzzy
-msgid "Show damage"
-msgstr "Mostrar nome"
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:232
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
-msgid "Show gender"
-msgstr "Mostrar nome"
+msgid "Unknown channel event."
+msgstr "Comando desconhecido"
 
-#: ../src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show own name"
-msgstr "Mostrar nome"
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Guilda criada."
 
-#: ../src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
-msgstr "Mostrar aviso de achado"
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Erro ao criar guilda."
 
-#: ../src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "Sentar"
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Convite enviado."
 
-#: ../src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Falha ao sentar!"
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Membro foi promovido com sucesso."
 
-#: ../src/gui/skilldialog.cpp:362
-#, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Competências"
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Erro ao promover membro."
 
-#: ../src/gui/skilldialog.cpp:353
-#, fuzzy, c-format
-msgid "Skill Set %d"
-msgstr "Pontos de habilidade: %d"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Simbolo-mágico errado."
 
-#: ../src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Janela de Habilidade"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Já está conectado"
 
-#: ../src/gui/skilldialog.cpp:271
-#, fuzzy, c-format
-msgid "Skill points available: %d"
-msgstr "Pontos de habilidade: %d"
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "A conta expirou"
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Competências"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Nova senha incorreta"
 
-#: ../src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr "Entradas:"
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Senha antiga incorreta"
 
-#: ../src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Pequeno"
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Conta não conectada. Por favor, efectue o login primeiro."
 
-#: ../src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Emoticons"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Novo endereço de email incorrecto"
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
-msgid "Social"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Antigo endereço de email incorrecto"
 
-#: ../src/keyboardconfig.cpp:80
+#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "Social Window"
-msgstr "Janela de Habilidade"
+msgid "The new email address already exists."
+msgstr "O novo endereço de email já existe."
 
-#: ../src/gui/setup_video.cpp:582
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:136
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Mais alguém está tentando utilizar esta conta"
-
-#: ../src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Som"
-
-#: ../src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr ""
+msgid "Client version is too old."
+msgstr "Versão do cliente é muito antiga"
 
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Nome de utilizador ou senha inválida"
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "A conta expirou"
 
-#: ../src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Espectro"
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Nome de utilizador, senha ou email inválido"
 
-#: ../src/net/tmwa/generalhandler.cpp:142
+#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Speed hack detected."
-msgstr "Hack de velocidade detectado"
+msgid "Username already exists."
+msgstr "Nome de utilizador já existe"
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
-msgid "Split"
-msgstr "Dividir"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Endereço de email já existe"
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: ../src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Iniciando a gravação..."
-
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Estática"
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Entrou para o grupo."
 
-#: ../src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Estado"
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s entrou para o grupo."
 
-#: ../src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Status"
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s recusou seu convite."
 
-#: ../src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Parar"
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Aceitando propostas de negócios."
 
-#: ../src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Parar ataque"
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorando propostas de negócios."
 
-#: ../src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Parar gravação"
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Proposta de negociação"
 
-#: ../src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Armazenamento"
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s quer negociar com você, você aceita?"
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
-msgid "Store"
-msgstr "Guardar"
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Negociando com %s"
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Força"
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Negociação cancelada."
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Força %+d"
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Negociação realizada."
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Força:"
+#: src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Erro na expulsão!"
 
-#: ../src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Enviar"
+#: src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Expulsão bem sucedida!"
 
-#: ../src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr ""
+#: src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Nada para vender."
 
-#: ../src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Mudar de personagem"
+#: src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Obrigado pela compra."
 
-#: ../src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Mudar de servidor"
+#: src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Impossível comprar."
 
-#: ../src/gui/setup_video.cpp:445
-#, fuzzy
-msgid "Switching to Full Screen"
-msgstr "Mudar para ecrã completo"
+#: src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Obrigado pela venda."
 
-#: ../src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Falar"
+#: src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Impossibilitado de vender."
 
-#: ../src/gui/popupmenu.cpp:150
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@talk|Falar com %s@@"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Selecionar & Atacar"
+#: src/net/tmwa/charserverhandler.cpp:107
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Não é possível usar esta ID"
 
-#: ../src/keyboardconfig.cpp:49
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Target Monster"
-msgstr "Seleccionar o mais próximo"
+msgid "Unknown char-server failure."
+msgstr "Erro desconhecido"
 
-#: ../src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "Seleccionar NPC"
+#: src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
-#: ../src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Seleccionar Jogador"
+#: src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Personagem apagado."
 
-#: ../src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "texto"
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Falha ao apagar personagem."
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Obrigado pela compra."
+#: src/net/tmwa/charserverhandler.cpp:266
+msgid "Strength:"
+msgstr "Força:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Obrigado pela venda."
+#: src/net/tmwa/charserverhandler.cpp:267
+msgid "Agility:"
+msgstr "Agilidade:"
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "As mãos frias da morte estão levando sua alma."
+#: src/net/tmwa/charserverhandler.cpp:268
+msgid "Vitality:"
+msgstr "Vitalidade:"
 
-#: ../src/game.cpp:368
-#, fuzzy
-msgid "The connection to the server was lost."
-msgstr "Conexão com o servidor perdida, o jogo será fechado"
+#: src/net/tmwa/charserverhandler.cpp:269
+msgid "Intelligence:"
+msgstr "Inteligência:"
 
-#: ../src/gui/changeemaildialog.cpp:141
-#, fuzzy
-msgid "The email address entries mismatch."
-msgstr "O novo endereço de email já existe."
+#: src/net/tmwa/charserverhandler.cpp:270
+msgid "Dexterity:"
+msgstr "Destreza:"
 
-#: ../src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "O novo endereço de email já existe."
+#: src/net/tmwa/charserverhandler.cpp:271
+msgid "Luck:"
+msgstr "Sorte:"
 
-#: ../src/gui/changeemaildialog.cpp:127
+#: src/net/tmwa/chathandler.cpp:87
 #, fuzzy, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Impossível enviar sussurro, o utilizador está desconectado."
 
-#: ../src/gui/changeemaildialog.cpp:134
+#: src/net/tmwa/chathandler.cpp:96
 #, fuzzy, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "O nome de utilizador só pode ter %d caracteres."
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Impossível enviar sussurro, está ignorado pelo utilizador."
 
-#: ../src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
+#: src/net/tmwa/chathandler.cpp:230
+#, fuzzy
+msgid "MVP player."
+msgstr "Jogador"
+
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Não há suporte para canais!"
+
+#: src/net/tmwa/gamehandler.cpp:88
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "A password necessita de pelo menos %d caracteres."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Game"
+msgstr "Nome"
 
-#: ../src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "A password só pode ter até %d caracteres."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Proposta de negociação"
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "A password necessita de pelo menos %d caracteres."
+msgid "Strength %+d"
+msgstr "Força %+d"
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "A password só pode ter até %d caracteres."
+msgid "Agility %+d"
+msgstr "Agilidade %+d"
 
-#: ../src/gui/register.cpp:166
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
+msgid "Vitality %+d"
+msgstr "Vitalidade %+d"
 
-#: ../src/gui/register.cpp:174
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "O nome de utilizador só pode ter %d caracteres."
-
-#: ../src/net/tmwa/generalhandler.cpp:139
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "Existe alguém logado a esta conta"
+msgid "Intelligence %+d"
+msgstr "Inteligência %+d"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Este comando faz com que o jogador saia do grupo."
+#: src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Destreza %+d"
 
-#: ../src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Este comando faz com que o jogador saia do grupo."
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
+msgstr "Sorte %+d"
 
-#: ../src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "Este comando muda a opção de partilha de experiência no grupo."
+#: src/net/tmwa/generalhandler.cpp:132
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Autenticação falhou"
 
-#: ../src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr "Este comando muda a opção de partilha de itens no grupo."
+#: src/net/tmwa/generalhandler.cpp:135
+#, fuzzy
+msgid "No servers available."
+msgstr "Não há servidores disponíveis"
 
-#: ../src/commandhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Define <mensagem> como o tópico."
+msgid "Someone else is trying to use this account."
+msgstr "Mais alguém está tentando utilizar esta conta"
 
-#: ../src/commandhandler.cpp:229
-msgid "This command clears the chat log of previous chat."
-msgstr "Limpa os logs do chat anterior."
+#: src/net/tmwa/generalhandler.cpp:142
+#, fuzzy
+msgid "This account is already logged in."
+msgstr "Existe alguém logado a esta conta"
 
-#: ../src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "Este comando fecha a atual aba de sussurros"
+#: src/net/tmwa/generalhandler.cpp:145
+#, fuzzy
+msgid "Speed hack detected."
+msgstr "Hack de velocidade detectado"
 
-#: ../src/commandhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Estes comandos criam um novo grupo chamado <nome-do-grupo>."
+msgid "Duplicated login."
+msgstr "Login duplicado"
 
-#: ../src/commandhandler.cpp:210
-msgid "This command displays a list of all commands available."
-msgstr "Este comando mostra a lista de todos os comandos disponiveis"
+#: src/net/tmwa/generalhandler.cpp:151
+#, fuzzy
+msgid "Unknown connection error."
+msgstr "Erro de conexão desconhecido"
 
-#: ../src/commandhandler.cpp:213
-msgid "This command displays help on <command>."
-msgstr "Exibe o conteúdo de ajuda de <command>"
+#: src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Você foi desconectado do servidor!"
 
-#: ../src/commandhandler.cpp:324
-msgid "This command displays the name of the current map."
-msgstr "Mostra o nome do mapa atual."
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Força"
 
-#: ../src/commandhandler.cpp:329
-msgid "This command displays the number of players currently online."
-msgstr "Mostra o número de jogadores conectados."
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Agilidade"
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr "Este comando exibe a actual opção de partilha de experiência no grupo."
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Vitalidade"
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr "Este comando exibe a actual opção de partilha de itens no grupo."
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Inteligência"
 
-#: ../src/commandhandler.cpp:313
-msgid "This command displays the return toggle status."
-msgstr "Este comando mostra o status do botão alternar."
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Destreza"
 
-#: ../src/commandhandler.cpp:302
-msgid "This command finishes a recording session."
-msgstr "Este comando finaliza a sessão de gravação."
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Sorte"
 
-#: ../src/commandhandler.cpp:292
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"Este comando obtém uma lista dos Jogadores ao alcance e a envia para o log "
-"de registo do chat ou, caso haja uma gravação em andamento, para o log de "
-"gravação."
+#: src/net/tmwa/generalhandler.cpp:238
+#, fuzzy
+msgid "Defense"
+msgstr "Defesa:"
 
-#: ../src/commandhandler.cpp:234
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Mostra o número de jogadores conectados."
+msgid "M.Attack"
+msgstr "M. Ataque:"
 
-#: ../src/gui/widgets/whispertab.cpp:89
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr "Mostra o número de jogadores conectados."
+msgid "M.Defense"
+msgstr "M. Defesa:"
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Convida <nick> para uma festa com você."
+#: src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Precisão:"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Convida <nick> para uma festa com você."
+#: src/net/tmwa/generalhandler.cpp:242
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% Fuga:"
 
-#: ../src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Sair do canal."
+#: src/net/tmwa/generalhandler.cpp:243
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "Golpe crítico"
 
-#: ../src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Tornar <nick> operador do canal."
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Guilda"
 
-#: ../src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Retirar <nick> do canal."
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Exibe esta ajuda."
 
-#: ../src/commandhandler.cpp:240
-msgid "This command makes you enter <channel>."
-msgstr "Este comando faz você entrar em <canal>."
+#: src/net/tmwa/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Convida um jogador para o seu grupo"
 
-#: ../src/commandhandler.cpp:223
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Enviar mensagem <msg> para todos os jogadores conectados."
+#: src/net/tmwa/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Sai do grupo em que você está"
 
-#: ../src/commandhandler.cpp:258
-msgid "This command sends the text <message> to <nick>."
-msgstr "Enviar <mensagem> para <nick>."
+#: src/net/tmwa/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa alguém do grupo em que você está"
 
-#: ../src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Define <mensagem> como o tópico."
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
 
-#: ../src/commandhandler.cpp:307
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Este comando define se a tecla enter deve alternar para o log do chat ou se "
-"o log do chat fica oculto automaticamente."
+#: src/net/tmwa/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Convida <nick> para uma festa com você."
 
-#: ../src/commandhandler.cpp:246
-msgid "This command shows a list of all channels."
-msgstr "Mostrar uma lista de todos os canais."
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Comando: /leave"
 
-#: ../src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Mostrar usuários do canal."
+#: src/net/tmwa/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando faz com que o jogador saia do grupo."
 
-#: ../src/commandhandler.cpp:299
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr ""
-"Este comando inicia a gravação do registo do chat para o ficheiro "
-"<nome_do_ficheiro>."
+#: src/net/tmwa/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Falta o nome do grupo."
 
-#: ../src/commandhandler.cpp:318
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:95
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
 msgstr ""
-"Este comando inicia a gravação do registo do chat para o ficheiro "
-"<nome_do_ficheiro>."
 
-#: ../src/commandhandler.cpp:251
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Este comando diz aos outros o que eu estou (fazendo) <msg>."
+#: src/net/tmwa/guildhandler.cpp:306
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s agora é um membro do seu grupo."
 
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
+#: src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
 msgstr ""
 
-#: ../src/commandhandler.cpp:266
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/net/tmwa/guildhandler.cpp:316
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Resposta de convite desconhecida para %s."
+
+#: src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
 msgstr ""
-"Este comando cria uma aba para mensagens confidenciais entre você e <nick>."
 
-#: ../src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "A cor se parece com isso"
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Festa"
 
-#: ../src/net/tmwa/loginhandler.cpp:179
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "Este nome de utilizador já está em uso"
+#: src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Convida um jogador para o seu grupo"
 
-#: ../src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Minúscula"
+#: src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Sai do grupo em que você está"
 
-#: ../src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "Para:"
+#: src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Expulsa alguém do grupo em que você está"
 
-#: ../src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr "Alternar para chat"
+#: src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Mostra/Muda opções de partilha de itens do grupo"
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Tópico: %s"
+#: src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Mostra/Modifica opções de partilha de experiência do grupo"
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Negócio"
+#: src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Este comando faz com que o jogador saia do grupo."
 
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Negociação cancelada."
+#: src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Comando> /item <opção>"
 
-#: ../src/net/tmwa/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Negociação cancelada devido a uma razão desconhecida."
+#: src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr "Este comando muda a opção de partilha de itens no grupo."
 
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Negociação realizada."
+#: src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar partilhar de "
+"itens, ou \"0\", \"no\" e \"false\" para desabilitar."
 
-#: ../src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Falha na negociação!"
+#: src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Comando: /item"
 
-#: ../src/net/tmwa/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Negociação com %s cancelada."
+#: src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr "Este comando exibe a actual opção de partilha de itens no grupo."
 
-#: ../src/gui/popupmenu.cpp:83
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "Negociando com %s"
+#: src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Comando: /exp <policy>"
 
-#: ../src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Negócio: você"
+#: src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr "Este comando muda a opção de partilha de experiência no grupo."
 
-#: ../src/net/tmwa/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Negociação: Você e %s"
+#: src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar partilha de "
+"experiência, ou \"0\", \"no\" e \"false\" para desabilitar."
 
-#: ../src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Negociação impossível. O personagem não existe."
+#: src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Comando: /exp"
 
-#: ../src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Negociação impossível. O parceiro de negócios está muito longe."
+#: src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Este comando exibe a actual opção de partilha de experiência no grupo."
 
-#: ../src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Negociando com %s"
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Partilha de itens habilitado."
 
-#: ../src/gui/setup_video.cpp:477
-#, fuzzy
-msgid "Transparency disabled"
-msgstr "Partilha de experiência desabilitado."
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Partilha de itens desabilitado."
 
-#: ../src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
-msgstr ""
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "Não é possível partilhar itens."
 
-#: ../src/localplayer.cpp:1251
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
-msgid "Tried to pick up nonexistent item."
-msgstr "Impossível pegar item."
+msgid "Item sharing unknown."
+msgstr "Partilha de itens habilitado."
 
-#: ../src/commandhandler.cpp:335
-msgid "Type /help for a list of commands."
-msgstr "Digite /help para ver uma lista de comandos."
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Partilha de experiência habilitado."
 
-#: ../src/gui/changeemaildialog.cpp:51
-#, fuzzy
-msgid "Type new email address twice:"
-msgstr "Digite o novo endereço de email duas vezes:"
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr "Partilha de experiência desabilitado."
 
-#: ../src/gui/changepassworddialog.cpp:63
-#, fuzzy
-msgid "Type new password twice:"
-msgstr "Digite a nova senha duas vezes:"
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "Não é possível partilhar experiência."
 
-#: ../src/gui/setup_colors.cpp:71
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
-msgid "Type:"
-msgstr "Tipo: "
+msgid "Experience sharing unknown."
+msgstr "Partilha de experiência habilitado."
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Impossível comprar."
+#: src/net/tmwa/inventoryhandler.cpp:285
+msgid "Failed to use item."
+msgstr "Problemas ao usar item."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Impossível equipar."
 
-#: ../src/net/tmwa/network.cpp:345
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Impossibilitado de vender."
-
-#: ../src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Impossibilitado de vender."
-
-#: ../src/net/tmwa/inventoryhandler.cpp:418
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Impossível desequipar."
 
-#: ../src/gui/setup_keyboard.cpp:90
-#, fuzzy
-msgid "Unassign"
-msgstr "Associar"
-
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
-msgid "Unequip"
-msgstr "Desequipar"
-
-#: ../src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "Desequipar"
-
-#: ../src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "Troca injusta pacote cancelado."
-
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr ""
+#: src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Conta não encontrada. Por favor, log novamente."
 
-#: ../src/net/net.cpp:145
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Tipo de item desconhecido"
+msgid "New password too short."
+msgstr "Nova senha é muito curta"
 
-#: ../src/net/manaserv/chathandler.cpp:327
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
-msgid "Unknown channel event."
-msgstr "Comando desconhecido"
+msgid "Unregistered ID."
+msgstr "ID não registado"
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Erro desconhecido"
-
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
-msgid "Unknown command."
-msgstr "Comando desconhecido"
+msgid "Wrong password."
+msgstr "Senha incorreta"
 
-#: ../src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
-msgid "Unknown connection error."
-msgstr "Erro de conexão desconhecido"
-
-#: ../src/net/manaserv/charhandler.cpp:208
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Erro desconhecido"
+msgid "Account expired."
+msgstr "A conta expirou"
 
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
-msgid "Unknown error."
-msgstr "Erro desconhecido"
+msgid "Rejected from server."
+msgstr "Rejeitado pelo servidor"
 
-#: ../src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
-msgid "Unknown guild invite response."
-msgstr "Resposta de convite desconhecida para %s."
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"Você foi permanentemente banido do jogo. Por favor entre em contacto com "
+"algum GM."
 
-#: ../src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
-msgid "Unknown invite response for %s."
-msgstr "Resposta de convite desconhecida para %s."
-
-#: ../src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Item desconhecido"
-
-#: ../src/localplayer.cpp:1258
-#, fuzzy
-msgid "Unknown problem picking up item."
-msgstr "Impossível pegar item."
-
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Remover o Registo"
-
-#: ../src/client.cpp:926
-#, fuzzy
-msgid "Unregister Successful"
-msgstr "Remover o Registo"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Você banido temporariamente do jogo até %s.\n"
+"Por favor entre em contacto com algum GM através dos fóruns."
 
-#: ../src/net/tmwa/loginhandler.cpp:156
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
-msgid "Unregistered ID."
-msgstr "ID não registado"
-
-#: ../src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Para cima"
-
-#: ../src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Atualizando..."
+msgid "This user name is already taken."
+msgstr "Este nome de utilizador já está em uso"
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
-msgid "Use"
-msgstr "Usar"
+#: src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#: ../src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
-msgid "User is now part of your guild."
-msgstr "%s agora é um membro do seu grupo."
-
-#: ../src/net/tmwa/guildhandler.cpp:300
-msgid "User rejected guild invite."
-msgstr ""
+msgid "Unable to resolve host \""
+msgstr "Impossibilitado de vender."
 
-#: ../src/net/manaserv/loginhandler.cpp:306
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
-msgid "Username already exists."
-msgstr "Nome de utilizador já existe"
+msgid "Connection to server terminated. "
+msgstr "Conectando ao servidor de mapas..."
 
-#: ../src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Vídeo"
+#: src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Não foi possível criar o grupo."
 
-#: ../src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Nomes visíveis"
+#: src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Grupo criado."
 
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Vitalidade"
+#: src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s já é membro de um grupo."
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
-msgid "Vitality %+d"
-msgstr "Vitalidade %+d"
+msgid "%s refused your invitation."
+msgstr "%s recusou seu convite."
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Vitalidade:"
+#: src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s agora é um membro do seu grupo."
 
-#: ../src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "Aguardando servidor"
+#: src/net/tmwa/partyhandler.cpp:131
+#, c-format
+msgid "Unknown invite response for %s."
+msgstr "Resposta de convite desconhecida para %s."
 
-#: ../src/gui/serverdialog.cpp:448
-#, fuzzy
-msgid "Waiting for server..."
-msgstr "Aguardando servidor"
+#: src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Você saiu do grupo."
 
-#: ../src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "Falha ao transportar..."
+#: src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s saiu do seu grupo."
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "Lamentamos informar que seu personagem foi morto em combate."
+#: src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Um membro desconhecido tentou dizer: %s"
 
-#: ../src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Peso:"
-
-#: ../src/gui/itempopup.cpp:126
-#, fuzzy, c-format
-msgid "Weight: %s"
-msgstr "Peso: "
-
-#: ../src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "Quando ignorado:"
-
-#: ../src/gui/popupmenu.cpp:91
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "Sussurrar"
+#: src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
+msgstr ""
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Impossível enviar sussurro, está ignorado pelo utilizador."
+#: src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s não está em seu grupo!"
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "Impossível enviar sussurro, o utilizador está desconectado."
+#: src/net/tmwa/playerhandler.cpp:100
+msgid "Insert coin to continue."
+msgstr "Insira uma moeda para continuar."
 
-#: ../src/gui/chat.cpp:452
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "A sussurrar para %s: %s"
+#: src/net/tmwa/playerhandler.cpp:118
+msgid "You're not dead yet. You're just resting."
+msgstr "Você não morreu ainda. Está apenas descansando."
 
-#: ../src/gui/socialwindow.cpp:158
-#, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:119
+msgid "You are no more."
+msgstr "Você não é mais."
 
-#: ../src/gui/socialwindow.cpp:237
-#, c-format
-msgid "Who would you like to invite to party %s?"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:120
+msgid "You have ceased to be."
+msgstr "Você deixou de ser."
 
-#: ../src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Força de Vontade:"
+#: src/net/tmwa/playerhandler.cpp:121
+msgid "You've expired and gone to meet your maker."
+msgstr "Você expirou e foi encontrar o seu criador."
 
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "Força de vontade %+d"
+#: src/net/tmwa/playerhandler.cpp:122
+msgid "You're a stiff."
+msgstr "Você é um cadáver."
 
-#: ../src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Simbolo-mágico errado."
+#: src/net/tmwa/playerhandler.cpp:123
+msgid "Bereft of life, you rest in peace."
+msgstr "Sem vida, descanse em paz."
 
-#: ../src/net/tmwa/loginhandler.cpp:159
-#, fuzzy
-msgid "Wrong password."
-msgstr "Senha incorreta"
+#: src/net/tmwa/playerhandler.cpp:124
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "Se não fosse tão animado, estaria comendo grama pela raiz."
 
-#: ../src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Nome de utilizador ou senha inválida"
+#: src/net/tmwa/playerhandler.cpp:125
+msgid "Your metabolic processes are now history."
+msgstr "Seus processos metabólicos são história agora."
 
-#: ../src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Nome de utilizador, senha ou email inválido"
+#: src/net/tmwa/playerhandler.cpp:126
+msgid "You're off the twig."
+msgstr "Você bateu as botas."
 
-#: ../src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Sim"
+#: src/net/tmwa/playerhandler.cpp:127
+msgid "You've kicked the bucket."
+msgstr "Você chutou o balde."
 
-#: ../src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Você morreu"
+#: src/net/tmwa/playerhandler.cpp:128
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+"Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito "
+"coro invisível."
 
-#: ../src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Você é um ex-jogador"
 
-#: ../src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:131
+msgid "You're pining for the fjords."
+msgstr "Você foi desta para melhor."
+
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
+msgid "Message"
+msgstr "Mensagem"
+
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Você está morto."
-
-#: ../src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Você não é mais."
-
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Você não está mais vivo."
+#: src/net/tmwa/playerhandler.cpp:313
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Você pegou "
 
-#: ../src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
+#: src/net/tmwa/playerhandler.cpp:348
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "Você não pode fazer isso agora!"
-
-#: ../src/net/tmwa/specialhandler.cpp:189
-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/tmwa/playerhandler.cpp:488
+msgid "Equip arrows first."
+msgstr "Equipe as flechas primeiro."
 
-#: ../src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "Você não tem dinheiro suficiente."
+#: src/net/tmwa/specialhandler.cpp:144
+msgid "Trade failed!"
+msgstr "Falha na negociação!"
 
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
-#, fuzzy, c-format
-msgid "You get %s"
-msgstr "Você obteve %s"
+#: src/net/tmwa/specialhandler.cpp:147
+msgid "Emote failed!"
+msgstr "Falha no Emote!"
 
-#: ../src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "Dá:"
+#: src/net/tmwa/specialhandler.cpp:150
+msgid "Sit failed!"
+msgstr "Falha ao sentar!"
 
-#: ../src/gui/socialwindow.cpp:592
-#, fuzzy, c-format
-msgid "You have been invited to join the %s party."
-msgstr "%s te convidou para entrar no grupo %s."
+#: src/net/tmwa/specialhandler.cpp:153
+msgid "Chat creating failed!"
+msgstr "Falha ao criar Chat!"
 
-#: ../src/gui/socialwindow.cpp:588
-#, fuzzy
-msgid "You have been invited you to join a party."
-msgstr "%s te convidou para entrar no seu grupo."
+#: src/net/tmwa/specialhandler.cpp:156
+msgid "Could not join party!"
+msgstr "Impossível entrar no grupo!"
 
-#: ../src/net/tmwa/loginhandler.cpp:168
-#, fuzzy
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Você foi permanentemente banido do jogo. Por favor entre em contacto com "
-"algum GM."
+#: src/net/tmwa/specialhandler.cpp:159
+msgid "Cannot shout!"
+msgstr "Impossível gritar!"
 
-#: ../src/net/tmwa/loginhandler.cpp:172
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
-msgstr ""
-"Você banido temporariamente do jogo até %s.\n"
-"Por favor entre em contacto com algum GM através dos fóruns."
+#: src/net/tmwa/specialhandler.cpp:168
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Você ainda não tem nível necessário!"
 
-#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Você deixou de ser."
+#: src/net/tmwa/specialhandler.cpp:171
+msgid "Insufficient HP!"
+msgstr "HP insuficiente!"
 
-#: ../src/net/tmwa/partyhandler.cpp:241
-msgid "You have left the party."
-msgstr "Você saiu do grupo."
+#: src/net/tmwa/specialhandler.cpp:174
+msgid "Insufficient SP!"
+msgstr "SP insuficiente!"
 
-#: ../src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
-#: ../src/net/tmwa/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Você ainda não tem nível necessário!"
+#: src/net/tmwa/specialhandler.cpp:180
+msgid "You cannot do that right now!"
+msgstr "Você não pode fazer isso agora!"
 
-#: ../src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:183
+msgid "Seems you need more money... ;-)"
+msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:186
+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/tmwa/specialhandler.cpp:189
+msgid "You need another red gem!"
+msgstr "Você precisa de outra gema vermelha!"
 
-#: ../src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra gema azul!"
 
-#: ../src/net/tmwa/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "Você precisa de outra gema vermelha!"
+#: src/net/tmwa/specialhandler.cpp:195
+msgid "You're carrying to much to do this!"
+msgstr "Você está com muita carga para fazer isso!"
 
-#: ../src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:198
+msgid "Huh? What's that?"
+msgstr "Hã? O que é isso?"
 
-#: ../src/localplayer.cpp:1276
-#, fuzzy, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Você pegou %s [@@%d|%s@@]."
-msgstr[1] "Você pegou %s [@@%d|%s@@]."
+#: src/net/tmwa/specialhandler.cpp:207
+msgid "Warp failed..."
+msgstr "Falha ao transportar..."
 
-#: ../src/net/tmwa/playerhandler.cpp:344
-#, fuzzy, c-format
-msgid "You picked up %s."
-msgstr "Você pegou "
+#: src/net/tmwa/specialhandler.cpp:210
+msgid "Could not steal anything..."
+msgstr "Não foi possível roubar nada..."
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro."
+#: src/net/tmwa/specialhandler.cpp:213
+msgid "Poison had no effect..."
+msgstr "Veneno não surtiu efeito..."
 
-#: ../src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Negociação impossível. O parceiro de negócios está muito longe."
 
-#: ../src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "Você é um cadáver."
+#: src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Negociação impossível. O personagem não existe."
 
-#: ../src/net/tmwa/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "Você está com muita carga para fazer isso!"
+#: src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Negociação cancelada devido a uma razão desconhecida."
 
-#: ../src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "Você não morreu ainda. Está apenas descansando."
+#: src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Negociação: Você e %s"
 
-#: ../src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
-msgstr "Você bateu as botas."
+#: src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Negociação com %s cancelada."
 
-#: ../src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr "Você foi desta para melhor."
+#: src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr "Troca injusta pacote cancelado."
 
-#: ../src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "Você expirou e foi encontrar o seu criador."
+#: src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
 
-#: ../src/net/tmwa/playerhandler.cpp:136
-msgid "You've kicked the bucket."
-msgstr "Você chutou o balde."
+#: src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
 
-#: ../src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
+#: src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Erro ao adicionar item devido a um motivo desconhecido."
+
+#: src/playerrelations.cpp:310
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|Ignorar completamente %s@@"
+
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
-"Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito "
-"coro invisível."
 
-#: ../src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "Seus processos metabólicos são história agora."
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "Ataque %+d"
 
-#: ../src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "O seu nome necessita de pelo menos 4 caracteres"
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "Defesa %+d"
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Seu plano de quebrar as armas de seus inimigos com o seu pescoço não deu "
-"certo."
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: ../src/gui/setup_video.cpp:233
-msgid "as particle"
-msgstr "como partícula"
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "elevado"
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Item desconhecido"
 
-#: ../src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "no chat"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "sem nome"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "baixo"
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr ""
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: ../src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "máximo"
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: ../src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "médio"
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Dinheiro: %d"
 
-#: ../src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "desligado"
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Trabalho:"
 
-#: ../src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr ""
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Nível: %d"
 
-#: ../src/gui/serverdialog.cpp:558
-#, c-format
-msgid "requires v%s"
-msgstr ""
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "Acesso negado"
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
-msgid "unnamed"
-msgstr "sem nome"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Erro desconhecido ao seleccionar personagem"
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " não foi possível criar, mas ela não existe! Saindo."
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "No momento ainda não é possível convidar deste modo."
 
-#~ msgid " video mode: "
-#~ msgstr " modo de video: "
+#~ msgid "Willpower:"
+#~ msgstr "Força de Vontade:"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Reflexo:"
+#~ msgid "Willpower %+d"
+#~ msgstr "Força de vontade %+d"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 da barra de HP"
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Força de Vontade:"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 da barra de HP"
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "Servidor cheio"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Armas para 2 mãos"
+#~ msgid "Text Shadow"
+#~ msgstr "Sombra do Texto"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 da barra de HP"
+#~ msgid "Text Outline"
+#~ msgstr "Borda do texto"
 
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Expulsar jogador@@"
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Rótulos da barra de progresso"
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Atacar %s@@"
+#~ msgid "Background"
+#~ msgstr "Plano de fundo"
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Cancelar@@"
+#~ msgid "Highlight"
+#~ msgstr "Realçar"
 
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|Desconsiderar %s@@"
+#~ msgid "Tab Highlight"
+#~ msgstr "Realçar aba"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Largar@@"
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Item muito caro"
 
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|Ignorar %s@@"
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Item está equipado"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Apanhar %s@@"
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|Pegar %s@@"
+#~ msgid "Player"
+#~ msgstr "Jogador"
 
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|Retirar@@"
+#~ msgid "Whisper"
+#~ msgstr "Sussurrar"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Dividir@@"
+#~ msgid "Is"
+#~ msgstr "É"
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Guardar@@"
+#~ msgid "Server"
+#~ msgstr "Servidor"
 
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Negociar com %s@@"
+#~ msgid "Logger"
+#~ msgstr "Histórico"
 
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Deixar de ignorar %s@@"
+#~ msgid "Hyperlink"
+#~ msgstr "Hiperligação"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Equipar@@"
+#~ msgid "Being"
+#~ msgstr "Ser"
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Desequipar@@"
+#~ msgid "Other Players' Names"
+#~ msgstr "Nomes de outros jogadores"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Usar@@"
+#~ msgid "Own Name"
+#~ msgstr "Nome Próprio"
 
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Acesso negado"
+#~ msgid "GM Names"
+#~ msgstr "Nomes dos GMs"
 
-#~ msgid "Ammo"
-#~ msgstr "Munição"
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
 
-#~ msgid "Arms"
-#~ msgstr "Braços"
+#~ msgid "Monsters"
+#~ msgstr "Monstros"
 
-#~ msgid "Attack:"
-#~ msgstr "Ataque:"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Tipo de item desconhecido"
 
-#~ msgid "Axe"
-#~ msgstr "Machado"
+#~ msgid "Generics"
+#~ msgstr "Genéricos"
 
-#~ msgid "Background"
-#~ msgstr "Plano de fundo"
+#~ msgid "Hats"
+#~ msgstr "Chapéus"
 
-#~ msgid "Bow"
-#~ msgstr "Arco"
+#~ msgid "Usables"
+#~ msgstr "Usáveis"
 
-#~ msgid "Buddy"
-#~ msgstr "Contacto"
+#~ msgid "Shirts"
+#~ msgstr "Camisas"
 
-#~ msgid "Buddy List"
-#~ msgstr "Lista de Contactos"
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Armas para 1 mão"
 
-#~ msgid "Buddys"
-#~ msgstr "Amigos"
+#~ msgid "Pants"
+#~ msgstr "Calças"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Lançar feitiço de teste 1"
+#~ msgid "Shoes"
+#~ msgstr "Sapatos"
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Lançar feitiço de teste 2"
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Armas para 1 mão"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Lançar feitiço de teste 3"
+#~ msgid "Shields"
+#~ msgstr "Escudos"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Comando: /new <nome-do-grupo>"
+#~ msgid "Rings"
+#~ msgstr "Anéis"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "A conectar ao servidor de contas..."
+#~ msgid "Necklaces"
+#~ msgstr "Colares"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Conectando ao servidor de personagens..."
+#~ msgid "Arms"
+#~ msgstr "Braços"
 
-#~ msgid "Cost"
-#~ msgstr "Custo"
+#~ msgid "Ammo"
+#~ msgstr "Munição"
 
-#~ msgid "Couldn't set "
-#~ msgstr "Não foi possível configurar "
+#~ msgid "Particle Effects"
+#~ msgstr "Efeitos de partícula"
 
-#~ msgid "Description: %s"
-#~ msgstr "Descrição: %s"
+#~ msgid "Pickup Notification"
+#~ msgstr "Aviso de achado"
 
-#~ msgid "Effect: %s"
-#~ msgstr "Efeito: %s"
+#~ msgid "Exp Notification"
+#~ msgstr "Aviso de experiência"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Falha ao mudar para "
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Jogador acerta monstro"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monstro acerta jogador"
 
-#~ msgid "Generics"
-#~ msgstr "Genéricos"
+#~ msgid "Critical Hit"
+#~ msgstr "Golpe crítico"
 
-#~ msgid "Guilds"
-#~ msgstr "Guildas"
+#~ msgid "Misses"
+#~ msgstr "Falhas"
 
 #~ msgid "HP Bar"
 #~ msgstr "Barra de HP"
 
-#~ msgid "Hats"
-#~ msgstr "Chapéus"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 da barra de HP"
 
-#~ msgid "Highlight"
-#~ msgstr "Realçar"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 da barra de HP"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Hiperligação"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 da barra de HP"
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "No momento ainda não é possível convidar deste modo."
+#~ msgid "no"
+#~ msgstr "não"
 
-#~ msgid "Is"
-#~ msgstr "É"
+#~ msgid "Buddy"
+#~ msgstr "Contacto"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Item está equipado"
+#~ msgid "Buddy List"
+#~ msgstr "Lista de Contactos"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Item muito caro"
+#~ msgid "Description: %s"
+#~ msgstr "Descrição: %s"
+
+#~ msgid "Effect: %s"
+#~ msgstr "Efeito: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Anterior"
+
+#~ msgid "New"
+#~ msgstr "Novo"
 
 #~ msgid "Job Level: %d"
 #~ msgstr "Nível de Trabalho: %d"
 
-#~ msgid "Knife"
-#~ msgstr "Faca"
+#~ msgid "Present: "
+#~ msgstr "Presente: "
 
-#~ msgid "Logger"
-#~ msgstr "Histórico"
+#~ msgid "Quit Guild"
+#~ msgstr "Sair da Guilda"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Recent:"
+#~ msgstr "Recente:"
 
 #~ msgid "Magic"
 #~ msgstr "Mágica"
 
-#~ msgid "Max level"
-#~ msgstr "Nível máximo"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Lançar feitiço de teste 1"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Habilidade Mistério"
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Lançar feitiço de teste 2"
 
-#~ msgid "Necklaces"
-#~ msgstr "Colares"
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Lançar feitiço de teste 3"
 
-#~ msgid "New"
-#~ msgstr "Novo"
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Armas para 2 mãos"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Negociar com %s@@"
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Armas para 1 mão"
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Atacar %s@@"
 
-#~ msgid "Pants"
-#~ msgstr "Calças"
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Desconsiderar %s@@"
 
-#~ msgid "Party Window"
-#~ msgstr "Janela de Grupo"
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignorar %s@@"
 
-#~ msgid "Player"
-#~ msgstr "Jogador"
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Deixar de ignorar %s@@"
 
-#~ msgid "Polearm"
-#~ msgstr "Lança"
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Expulsar jogador@@"
 
-#~ msgid "Present: "
-#~ msgstr "Presente: "
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancelar@@"
 
-#~ msgid "Previous"
-#~ msgstr "Anterior"
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Pegar %s@@"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Rótulos da barra de progresso"
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Desequipar@@"
 
-#~ msgid "Quit Guild"
-#~ msgstr "Sair da Guilda"
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Equipar@@"
 
-#~ msgid "Recent:"
-#~ msgstr "Recente:"
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Usar@@"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Pontos de Estado Restantes: %d"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Largar@@"
 
-#~ msgid "Rings"
-#~ msgstr "Anéis"
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Dividir@@"
+
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Guardar@@"
+
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Retirar@@"
 
 #~ msgid "Select Server"
 #~ msgstr "Escolher servidor"
 
-#~ msgid "Server"
-#~ msgstr "Servidor"
-
-#~ msgid "Shields"
-#~ msgstr "Escudos"
+#~ msgid "Failed to switch to "
+#~ msgstr "Falha ao mudar para "
 
-#~ msgid "Shirts"
-#~ msgstr "Camisas"
+#~ msgid "windowed"
+#~ msgstr "em janela"
 
-#~ msgid "Shoes"
-#~ msgstr "Sapatos"
+#~ msgid "fullscreen"
+#~ msgstr "tela cheia"
 
-#~ msgid "Shooting"
-#~ msgstr "Tiro"
+#~ msgid "Mystery Skill"
+#~ msgstr "Habilidade Mistério"
 
-#~ msgid "Staff"
-#~ msgstr "Bastão"
+#~ msgid "Weapons"
+#~ msgstr "Armas"
 
 #~ msgid "Stats"
 #~ msgstr "Estatísticas"
 
-#~ msgid "Sword"
-#~ msgstr "Espada"
+#~ msgid "Total"
+#~ msgstr "Total"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Realçar aba"
+#~ msgid "Cost"
+#~ msgstr "Custo"
 
-#~ msgid "Text Outline"
-#~ msgstr "Borda do texto"
+#~ msgid "Attack:"
+#~ msgstr "Ataque:"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Sombra do Texto"
+#~ msgid "% Reflex:"
+#~ msgstr "% Reflexo:"
 
-#~ msgid "Thrown"
-#~ msgstr "Arremesso"
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Pontos de Estado Restantes: %d"
 
-#~ msgid "Total"
-#~ msgstr "Total"
+#~ msgid "Max level"
+#~ msgstr "Nível máximo"
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Armas para 1 mão"
+#~ msgid "Guilds"
+#~ msgstr "Guildas"
+
+#~ msgid "Buddys"
+#~ msgstr "Amigos"
+
+#~ msgid "Party Window"
+#~ msgstr "Janela de Grupo"
 
 #~ msgid "Unarmed"
 #~ msgstr "Desarmado"
 
-#~ msgid "Unknown Skill"
-#~ msgstr "Habilidade desconhecida"
-
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Erro desconhecido ao seleccionar personagem"
+#~ msgid "Knife"
+#~ msgstr "Faca"
 
-#~ msgid "Unnamed"
-#~ msgstr "Sem nome"
+#~ msgid "Sword"
+#~ msgstr "Espada"
 
-#~ msgid "Usables"
-#~ msgstr "Usáveis"
+#~ msgid "Polearm"
+#~ msgstr "Lança"
 
-#~ msgid "Weapons"
-#~ msgstr "Armas"
+#~ msgid "Staff"
+#~ msgstr "Bastão"
 
 #~ msgid "Whip"
 #~ msgstr "Chicote"
 
-#~ msgid "Whisper"
-#~ msgstr "Sussurrar"
+#~ msgid "Bow"
+#~ msgstr "Arco"
 
-#~ msgid "Willpower:"
-#~ msgstr "Força de Vontade:"
+#~ msgid "Shooting"
+#~ msgstr "Tiro"
 
-#~ msgid "a"
-#~ msgstr "um(a)"
+#~ msgid "Axe"
+#~ msgstr "Machado"
 
-#~ msgid "fullscreen"
-#~ msgstr "tela cheia"
+#~ msgid "Thrown"
+#~ msgstr "Arremesso"
+
+#~ msgid "Unknown Skill"
+#~ msgstr "Habilidade desconhecida"
+
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " não foi possível criar, mas ela não existe! Saindo."
+
+#~ msgid "Couldn't set "
+#~ msgstr "Não foi possível configurar "
+
+#~ msgid " video mode: "
+#~ msgstr " modo de video: "
 
 #~ msgid "mana"
 #~ msgstr "mana"
 
-#~ msgid "no"
-#~ msgstr "não"
+#~ msgid "Connecting to character server..."
+#~ msgstr "Conectando ao servidor de personagens..."
 
-#~ msgid "windowed"
-#~ msgstr "em janela"
+#~ msgid "Connecting to account server..."
+#~ msgstr "A conectar ao servidor de contas..."
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Comando: /new <nome-do-grupo>"
+
+#~ msgid "a"
+#~ msgstr "um(a)"
+
+#~ msgid "Unnamed"
+#~ msgstr "Sem nome"
+
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@pickup|Apanhar %s@@"
diff --git a/po/sk.po b/po/sk.po
index bd747b4e..585f99d8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-06-08 22:09+0000\n"
 "Last-Translator: Thorbjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -19,481 +19,458 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Nastavenie"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Pripájam sa..."
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Prihlásenie"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Vyberte postavu"
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Vyberte Server"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Heslo:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Zrušiť registráciu"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Neznámy príkaz."
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Pomoc --"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Príkaz: /hel"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Tento príkaz zobrazí zoznam veštkých prístupných príkazov."
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Príkaz: /help <príkaz>"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Tento príkaz zobrazí nápovedu pre <príkaz>."
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Príkaz: /announce <správa>"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** prístupné iba pre GM ***"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Tento príkaz pošle správu <správa> všetkým pripojeným používateľom."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Príkaz: /clear"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Tento príkaz vymaže obsah logu predchádzajúceho rozhovoru."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Príkaz: /announce <správa>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Tento príkaz zobrazí po�et aktuálne pripojených hrá�ov."
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Ak <nick> medzery v mene, použi dvojité úvodzovky (\")."
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Príkaz: /clear"
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-#, fuzzy
-msgid "Command: /away"
-msgstr "Príkaz: /who"
-
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Tento príkaz vymaže obsah logu predchádzajúceho rozhovoru."
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Príkaz: /clear"
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Príkaz: /announce <správa>"
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Príkaz: /where"
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Tento príkaz zobrazí meno aktuálne mapy."
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Príkaz: /who"
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Tento príkaz zobrazí po�et aktuálne pripojených hrá�ov."
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Napíš /help pre zoznam príkazov."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -502,40 +479,40 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Nie je možné  vstúpiť do párty!"
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -549,34 +526,34 @@ msgstr ""
 msgid "Buy"
 msgstr "Kúpiť"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Ukon�iť"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -590,11 +567,11 @@ msgstr "Predaj"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Zrušiť"
@@ -667,14 +644,14 @@ msgstr "Vytvoriť postavu"
 msgid "Name:"
 msgstr "Meno"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -691,8 +668,8 @@ msgstr "Farba vlasov:"
 msgid "Hair style:"
 msgstr "Štýl vlasov:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Vytvoriť"
 
@@ -748,8 +725,8 @@ msgstr "Zrušiť registráciu"
 msgid "Change Email"
 msgstr "Zmeniť Emailovú adresu"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Vymazať"
 
@@ -758,24 +735,24 @@ msgstr "Vymazať"
 msgid "Choose"
 msgstr "Zatvoriť"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
@@ -841,8 +818,8 @@ msgstr ""
 msgid "Equipment"
 msgstr "Vybavenie"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Odstrojiť"
 
@@ -850,7 +827,7 @@ msgstr "Odstrojiť"
 msgid "Help"
 msgstr "Nápoveda"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Zatvoriť"
 
@@ -862,81 +839,84 @@ msgstr "Inventár"
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Vystrojiť"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Použiť"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Zahodiť"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Zahodiť"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Potvrdiť"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Zvoľte množstvo vecí k predaju."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Zvoľte množstvo vecí k zahodeniu."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Zvoľte množstvo vecí k rozdeleniu."
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Effekt: %s"
@@ -967,40 +947,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Nasledujúci"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1015,7 +995,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1102,7 +1082,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1174,59 +1154,59 @@ msgstr "Heslo musí byť menšie %d ako písmen."
 msgid "Passwords do not match."
 msgstr "Heslá sa nezhodujú."
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Pripájam sa..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Vyberte Server"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1263,50 +1243,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1390,27 +1370,31 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1466,489 +1450,460 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Nie"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Schopnosti"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Schopnosti"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Klany, aliancie, guildy"
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "Peniaze: %d"
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Charakterové staty OK"
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Level: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1987,79 +1942,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Klany, aliancie, guildy"
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2136,55 +2018,55 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Globálne oznámenie:"
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globálne oznámenie od %s:"
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "Nápoveda pre %s: %s"
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Príkaz: /where"
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Tento príkaz zobrazí po�et aktuálne pripojených hrá�ov."
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2209,390 +2091,403 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
 msgid "Character's stats are too high."
 msgstr "Charakterové staty OK"
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 #, fuzzy
 msgid "Character's stats are too low."
 msgstr "Charakterové staty OK"
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2600,92 +2495,92 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Neznámy príkaz."
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Zvoľte množstvo vecí k predaju."
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Neznámy príkaz."
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "Neznámy príkaz."
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2764,11 +2659,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2778,188 +2673,135 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Sila vôle:"
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Neznámy príkaz."
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Sila:"
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Čulosť:"
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitalita:"
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Obratnosť:"
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2973,72 +2815,117 @@ msgstr "Meno"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Vytvorenie postavy sa nepodarilo"
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Vymazať"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3084,27 +2971,27 @@ msgstr "Tento príkaz zobrazí meno aktuálne mapy."
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3180,15 +3067,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3196,15 +3083,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3212,15 +3099,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3278,7 +3165,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3286,242 +3173,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Obchod sa nepodaril!"
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Zobrazenie smajlíka sa nepodarilo!"
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Sadnutie sa nepodarilo!"
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Vytvorenie postavy sa nepodarilo"
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Nie je možné  vstúpiť do párty!"
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Nemôžem kri�ať!"
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Ešte si nedosiahol dostato�ne vysokú úroveť!"
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "Nedostatok HP!"
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "Nedostatok SP!"
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Nemáš žiadne poznámky!"
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Práve teraz to nemôžeš robiť."
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nemôžeš použiť túto zru�nosť s touto zbraňou!"
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Potrebuješ �aľší �ervený gem!"
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Potrebuješ �aľší modrý gem!"
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Nosíš veľa, aby si mohol spraviť toto!"
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Heh? ÄŒo to je?"
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Warp sa nepodaril ..."
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Nedá sa kradnúť ..."
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Jed nemá žiaden ú�innok ..."
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3537,58 +3419,61 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Peniaze: %d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Level: %d"
+
 #~ msgid "Willpower:"
 #~ msgstr "Sila vôle:"
 
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Sila vôle:"
+
 #~ msgid "Description: %s"
 #~ msgstr "Popis: %s"
 
diff --git a/po/sq.po b/po/sq.po
index 03ba7120..c1e27a95 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-01-02 10:47+0000\n"
 "Last-Translator: Jat Lee <Unknown>\n"
 "Language-Team: Albanian <sq@li.org>\n"
@@ -19,468 +19,448 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Unknown command > Komand e panjohur"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Ndihmë--"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/ndihmë > Ndihmë përeth disa komandave"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/ku > Emri i mapit ku gjendesh"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/kush > Numri i lojtarëve online"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/unë >Trego diqka për veten"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/pastro > Pastro këtë dritare"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/mesazh > Dërgo mesazh privat te playeri që dëshiron"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/pëshpëritje > pseudonim i mesazhit"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > pseudonim i mesazhit"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:274
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -489,39 +469,39 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -535,34 +515,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -576,11 +556,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -653,14 +633,14 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -675,8 +655,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -731,8 +711,8 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
@@ -740,24 +720,24 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -823,8 +803,8 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
@@ -832,7 +812,7 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
@@ -844,80 +824,83 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -946,40 +929,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -993,7 +976,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1079,7 +1062,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1151,56 +1134,56 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1237,50 +1220,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1364,27 +1347,31 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1440,484 +1427,457 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-msgid "Level"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1956,78 +1916,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2104,53 +1992,53 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2174,389 +2062,402 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/ndihmë > Ndihmë përeth disa komandave"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2564,91 +2465,91 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Unknown command > Komand e panjohur"
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Unknown command > Komand e panjohur"
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "Unknown command > Komand e panjohur"
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2725,11 +2626,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2739,187 +2640,135 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Unknown command > Komand e panjohur"
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2932,70 +2781,115 @@ msgstr ""
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3040,27 +2934,27 @@ msgstr ""
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3136,15 +3030,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3152,15 +3046,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3168,15 +3062,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3232,7 +3126,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3240,242 +3134,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3491,51 +3380,42 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 1b5add60..8949cd3b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-17 05:36+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -19,420 +19,361 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/npcdialog.cpp:183
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Nästa"
-
-#: ../src/main.cpp:60
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl   : Använd inte OpenGL den här sessionen"
-
-#: ../src/main.cpp:58
-#, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir    : Katalog att använda som hemkatalog"
-
-#: ../src/main.cpp:52
-#, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Använd den här uppdateringsvärden"
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Inställningar"
 
-#: ../src/main.cpp:46
+#: src/client.cpp:679
 #, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Konfigurationsfil att använda"
+msgid "Connecting to server"
+msgstr "Ansluter till kartservern..."
 
-#: ../src/main.cpp:53
+#: src/client.cpp:706
 #, fuzzy
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default     : Välj förvald karaktärsserver och karaktär"
+msgid "Logging in"
+msgstr "Användarnamn"
 
-#: ../src/main.cpp:57
-#, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir    : Katalog att använda som hemkatalog"
+#: src/client.cpp:739
+msgid "Entering game world"
+msgstr ""
 
-#: ../src/main.cpp:48
+#: src/client.cpp:804
 #, fuzzy
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password    : Logga in med det här lösenordet"
+msgid "Requesting characters"
+msgstr "Välj karaktär"
 
-#: ../src/main.cpp:47
+#: src/client.cpp:833
 #, fuzzy
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username    : Logga in med det här användarnamnet"
+msgid "Connecting to the game server"
+msgstr "Ansluter till kartservern..."
 
-#: ../src/main.cpp:49
+#: src/client.cpp:843
 #, fuzzy
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character   : Logga in med den här karaktären"
+msgid "Changing game servers"
+msgstr "Server"
 
-#: ../src/main.cpp:56
-#, fuzzy
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data        : Katalog att hämta speldata från"
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Fel"
 
-#: ../src/main.cpp:45
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help        : Visa den här hjälpen"
+#: src/client.cpp:888
+msgid "Requesting registration details"
+msgstr ""
 
-#: ../src/main.cpp:51
+#: src/client.cpp:915
 #, fuzzy
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port        : Port på inloggningsserver"
+msgid "Password Change"
+msgstr "Lösenord:"
 
-#: ../src/main.cpp:50
-#, fuzzy
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server      : Namn eller IP-adress för inloggningsserver"
+#: src/client.cpp:916
+msgid "Password changed successfully!"
+msgstr ""
 
-#: ../src/main.cpp:55
+#: src/client.cpp:935
 #, fuzzy
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Ladda inte ner uppdateringar"
+msgid "Email Change"
+msgstr "Ändra"
 
-#: ../src/main.cpp:44
+#: src/client.cpp:936
 #, fuzzy
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version     : Visa aktuell version"
-
-#: ../src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1  Det rekommenderar verkligen att"
-
-#: ../src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1  Uppdateringsprocessen är inte avslutad."
+msgid "Email changed successfully!"
+msgstr "Medlem befordrad."
 
-#: ../src/gui/updatewindow.cpp:421
+#: src/client.cpp:956
 #, fuzzy
-msgid "##1  you try again later."
-msgstr "##1  du försöker igen senare"
-
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Träffsäkerhet:"
-
-#: ../src/net/tmwa/generalhandler.cpp:230
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "Kritisk träff"
-
-#: ../src/net/tmwa/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% Kringgå:"
-
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr ""
+msgid "Unregister Successful"
+msgstr "Avregistrera"
 
-#: ../src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
+#: src/client.cpp:957
+msgid "Farewell, come back any time..."
 msgstr ""
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: ../src/net/manaserv/chathandler.cpp:291
+#: src/client.cpp:1281
 #, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s anslöt sig till gruppen."
+msgid "Invalid update host: %s"
+msgstr "Ogiltig uppdateringsvärd: "
 
-#: ../src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s har bjudit in dig till %ss grupp."
+#: src/client.cpp:1315 src/client.cpp:1321
+msgid "Error creating updates directory!"
+msgstr "Kunde inte skapa katalog för uppdateringar!"
 
-#: ../src/gui/socialwindow.cpp:561
-#, fuzzy, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s har bjudit in dig till %ss grupp."
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
+msgid "Unknown command."
+msgstr "Okänt kommando."
 
-#: ../src/gui/socialwindow.cpp:600
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s har bjudit in dig till sin grupp."
+#: src/commandhandler.cpp:160
+msgid "-- Help --"
+msgstr "-- Hjälp --"
 
-#: ../src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#: src/commandhandler.cpp:161
+msgid "/help > Display this help"
+msgstr "/help > Visa den här hjälpen"
 
-#: ../src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s har lämnat din grupp."
+#: src/commandhandler.cpp:163
+msgid "/where > Display map name"
+msgstr "/where > Visa kartans namn"
 
-#: ../src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#: src/commandhandler.cpp:164
+msgid "/who > Display number of online users"
+msgstr "/who > Visa antalet inloggade spelare"
 
-#: ../src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s är redan medlem i en grupp."
+#: src/commandhandler.cpp:165
+msgid "/me > Tell something about yourself"
+msgstr "/me > Säg något om dig själv"
 
-#: ../src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s är inte med i din grupp!"
+#: src/commandhandler.cpp:167
+msgid "/clear > Clears this window"
+msgstr "/clear > Tömmer det här fönstret"
 
-#: ../src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s är nu en medlem i din grupp."
+#: src/commandhandler.cpp:169
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Skickar ett privat meddelande till en spelare"
 
-#: ../src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s anslöt sig till gruppen."
+#: src/commandhandler.cpp:170
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Alias för msg"
 
-#: ../src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
+#: src/commandhandler.cpp:171
+msgid "/w > Alias of msg"
+msgstr "/w > Alias för msg"
+
+#: src/commandhandler.cpp:172
+msgid "/query > Makes a tab for private messages with another user"
+msgstr "/query > Skapar en flik för privata meddelanden med en annan spelare"
+
+#: src/commandhandler.cpp:174
+msgid "/q > Alias of query"
+msgstr "/q > Alias för query"
+
+#: src/commandhandler.cpp:176
+msgid "/ignore > ignore a player"
 msgstr ""
 
-#: ../src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s avvisade din inbjudan."
+#: src/commandhandler.cpp:177
+msgid "/unignore > stop ignoring a player"
+msgstr ""
 
-#: ../src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s avvisade din inbjudan."
+#: src/commandhandler.cpp:179
+msgid "/list > Display all public channels"
+msgstr "/list > Visa alla offentliga chattkanaler"
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s vill byteshandla med dig, accepterar du?"
+#: src/commandhandler.cpp:180
+msgid "/join > Join or create a channel"
+msgstr "/join > GÃ¥ med i eller skapa en chattkanal"
 
-#: ../src/gui/widgets/chattab.cpp:152
-#, fuzzy, c-format
-msgid "%s whispers: %s"
-msgstr "%s viskar: "
+#: src/commandhandler.cpp:182
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Skapa ny grupp"
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
-msgid "(empty)"
-msgstr ""
+#: src/commandhandler.cpp:183
+msgid "/party > Invite a user to party"
+msgstr "/party > Bjud in en spelare till din grupp"
 
-#: ../src/commandhandler.cpp:222
-msgid "*** only available to a GM ***"
-msgstr "*** endast en GM kan använda det här kommandot ***"
+#: src/commandhandler.cpp:185
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Påbörja loggning av chatten till en extern fil"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
-msgid "+"
-msgstr ""
+#: src/commandhandler.cpp:187
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr "/toggle > Avgör huruvida <retur> aktiverar chattfönstret eller ej"
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
-msgid "-"
+#: src/commandhandler.cpp:189
+msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
+"/present > Lista närvarande spelare (sänds till chattloggen om loggning är "
+"aktiverad)"
 
-#: ../src/commandhandler.cpp:166
-msgid "-- Help --"
-msgstr "-- Hjälp --"
-
-#: ../src/commandhandler.cpp:201
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globalt meddelande (endast för GM)"
 
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
+#: src/commandhandler.cpp:196
+msgid "For more information, type /help <command>."
+msgstr "Skriv /help <kommando> för mer information."
 
-#: ../src/commandhandler.cpp:173
-msgid "/clear > Clears this window"
-msgstr "/clear > Tömmer det här fönstret"
+#: src/commandhandler.cpp:200
+msgid "Command: /help"
+msgstr "Kommando: /help"
 
-#: ../src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Stänger viskningsfliken"
+#: src/commandhandler.cpp:201
+msgid "This command displays a list of all commands available."
+msgstr "Det här kommandot visar en lista över alla tillgängliga kommandon."
 
-#: ../src/commandhandler.cpp:191
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Skapa ny grupp"
+#: src/commandhandler.cpp:203
+msgid "Command: /help <command>"
+msgstr "Kommando: /help <kommando>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Visa/ändra hur erfarenhet fördelas i gruppen"
+#: src/commandhandler.cpp:204
+msgid "This command displays help on <command>."
+msgstr "Det här kommandot ger mer information om <kommando>."
 
-#: ../src/commandhandler.cpp:167
-msgid "/help > Display this help"
-msgstr "/help > Visa den här hjälpen"
+#: src/commandhandler.cpp:212
+msgid "Command: /announce <msg>"
+msgstr "Kommando: /announce <text>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Visa den här hjälpen"
+#: src/commandhandler.cpp:213
+msgid "*** only available to a GM ***"
+msgstr "*** endast en GM kan använda det här kommandot ***"
 
-#: ../src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
+#: src/commandhandler.cpp:214
+msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
+"Det här kommandot skickar meddelandet <text> till alla inloggade spelare."
 
-#: ../src/commandhandler.cpp:185
-msgid "/ignore > ignore a player"
-msgstr ""
+#: src/commandhandler.cpp:219
+msgid "Command: /clear"
+msgstr "Kommando: /clear"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Bjud in en spelare till din grupp"
+#: src/commandhandler.cpp:220
+msgid "This command clears the chat log of previous chat."
+msgstr "Det här kommandot tömmer chattloggen."
 
-#: ../src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Bjud in en spelare till din grupp"
+#: src/commandhandler.cpp:224
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Kommando: /item <alternativ>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > Visa/ändra delningsalternativ för upplock inom gruppen"
+#: src/commandhandler.cpp:225
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 
-#: ../src/commandhandler.cpp:189
-msgid "/join > Join or create a channel"
-msgstr "/join > GÃ¥ med i eller skapa en chattkanal"
+#: src/commandhandler.cpp:230
+msgid "Command: /join <channel>"
+msgstr "Kommando: /join <chattkanal>"
 
-#: ../src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Sparka ut en spelare från chattkanalen"
+#: src/commandhandler.cpp:231
+msgid "This command makes you enter <channel>."
+msgstr "Det här kommandot låter dig gå in i <chattkanal>."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:64
-#, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Sparka ut någon från din grupp"
+#: src/commandhandler.cpp:232
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Om <chattkanal> inte existerar, skapas den."
 
-#: ../src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Sparka ut någon från din grupp"
+#: src/commandhandler.cpp:236
+msgid "Command: /list"
+msgstr "Kommando: /list"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:63
-#, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Lämna gruppen du är i"
+#: src/commandhandler.cpp:237
+msgid "This command shows a list of all channels."
+msgstr "Det här kommandot visar en lista över alla chattkanaler."
 
-#: ../src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Lämna gruppen du är i"
+#: src/commandhandler.cpp:241
+msgid "Command: /me <message>"
+msgstr "Kommando: /me <meddelande>"
 
-#: ../src/commandhandler.cpp:188
-msgid "/list > Display all public channels"
-msgstr "/list > Visa alla offentliga chattkanaler"
+#: src/commandhandler.cpp:242
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Det här kommandet berättar för andra att du är/gör <meddelande>."
 
-#: ../src/commandhandler.cpp:171
-msgid "/me > Tell something about yourself"
-msgstr "/me > Säg något om dig själv"
+#: src/commandhandler.cpp:246
+msgid "Command: /msg <nick> <message>"
+msgstr "Kommando: /msg <spelare> <meddelande>"
 
-#: ../src/commandhandler.cpp:175
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Skickar ett privat meddelande till en spelare"
+#: src/commandhandler.cpp:247
+msgid "Command: /whisper <nick> <message>"
+msgstr "Kommando: /whisper <spelare> <meddelande>"
 
-#: ../src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Gör en spelare till chattkanalsoperatör"
+#: src/commandhandler.cpp:248
+msgid "Command: /w <nick> <message>"
+msgstr "Kommando: /w <spelare> <meddelande>"
 
-#: ../src/commandhandler.cpp:192
-msgid "/party > Invite a user to party"
-msgstr "/party > Bjud in en spelare till din grupp"
+#: src/commandhandler.cpp:249
+msgid "This command sends the text <message> to <nick>."
+msgstr "Det här kommandot skickar <meddelande> till <spelare>."
 
-#: ../src/commandhandler.cpp:198
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
-"/present > Lista närvarande spelare (sänds till chattloggen om loggning är "
-"aktiverad)"
+"Om <spelare> innehåller mellanslag, måste du sätta citattecken (\") runt det."
 
-#: ../src/commandhandler.cpp:180
-msgid "/q > Alias of query"
-msgstr "/q > Alias för query"
+#: src/commandhandler.cpp:255
+msgid "Command: /query <nick>"
+msgstr "Kommando: /query <spelare>"
 
-#: ../src/commandhandler.cpp:178
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Skapar en flik för privata meddelanden med en annan spelare"
+#: src/commandhandler.cpp:256
+msgid "Command: /q <nick>"
+msgstr "Kommando: /q <spelare>"
 
-#: ../src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Lämnar chattkanalen"
+#: src/commandhandler.cpp:257
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+msgstr ""
+"Det här kommandot försöker att skapa en flik för viskningar mellan dig och "
+"<spelare>."
 
-#: ../src/commandhandler.cpp:194
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Påbörja loggning av chatten till en extern fil"
+#: src/commandhandler.cpp:262
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Kommando: /create <grupp>"
 
-#: ../src/commandhandler.cpp:196
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Avgör huruvida <retur> aktiverar chattfönstret eller ej"
+#: src/commandhandler.cpp:263
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Dessa kommandon skapar <grupp>."
 
-#: ../src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Sätter ämnet för chattkanalen"
+#: src/commandhandler.cpp:267
+msgid "Command: /party <nick>"
+msgstr "Kommando: /party <spelare>"
 
-#: ../src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Det här kommandot bjuder in <spelare> till din grupp."
 
-#: ../src/commandhandler.cpp:186
-msgid "/unignore > stop ignoring a player"
-msgstr ""
+#: src/commandhandler.cpp:274
+msgid "Command: /present"
+msgstr "Kommando: /present"
 
-#: ../src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
+#: src/commandhandler.cpp:275
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
 msgstr ""
-"/users > Visar en lista över de spelare som finns i den aktuella chattkanalen"
-
-#: ../src/commandhandler.cpp:177
-msgid "/w > Alias of msg"
-msgstr "/w > Alias för msg"
+"Det här kommandot ger en lista över spelare som finns inom höravstånd, om "
+"loggning av chatten är aktiverad skickas listan till loggfilen."
 
-#: ../src/commandhandler.cpp:169
-msgid "/where > Display map name"
-msgstr "/where > Visa kartans namn"
+#: src/commandhandler.cpp:281
+msgid "Command: /record <filename>"
+msgstr "Kommando: /record <filnamn>"
 
-#: ../src/commandhandler.cpp:176
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias för msg"
+#: src/commandhandler.cpp:282
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr "Det här kommandot startar loggning av chatten till <filnamn>."
 
-#: ../src/commandhandler.cpp:170
-msgid "/who > Display number of online users"
-msgstr "/who > Visa antalet inloggade spelare"
+#: src/commandhandler.cpp:284
+msgid "Command: /record"
+msgstr "Kommando: /record"
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
-#: ../src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr ""
+#: src/commandhandler.cpp:285
+msgid "This command finishes a recording session."
+msgstr "Det här kommandot slutar loggning av chatten."
 
-#: ../src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr ""
-"<alternativ> kan vara antingen �1�, �yes� eller �true� för att tillåta "
-"delning av erfarenhet, eller �0�, �no� eller �false� för att inte dela på "
-"erfarenhet."
+#: src/commandhandler.cpp:289
+msgid "Command: /toggle <state>"
+msgstr "Kommando: /toggle <tillstånd>"
 
-#: ../src/net/tmwa/gui/partytab.cpp:87
+#: src/commandhandler.cpp:290
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
-"<alternativ> kan vara antingen �1�, �yes� eller �true� för att dela på "
-"upplocken inom gruppen (vem som helst inom gruppen kan direkt plocka upp "
-"efter alla gruppmedlemmar), eller �0�, �no� eller �false� för att inte dela "
-"på upplocken."
+"Det här kommandot anger huruvida retur visar/döljerer chattfönstret eller om "
+"chattfönstret stänger sig själv."
 
-#: ../src/commandhandler.cpp:309
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -440,3530 +381,3447 @@ msgstr ""
 "<tillstånd> kan vara �1�, �yes� eller �true� för att använda returtangenten "
 "eller �0�, �no� eller �false� för att använda automatisk stängning."
 
-#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
-#: ../src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ""
+#: src/commandhandler.cpp:295
+msgid "Command: /toggle"
+msgstr "Kommando: /toggle"
 
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: src/commandhandler.cpp:296
+msgid "This command displays the return toggle status."
+msgstr "Det här kommandot visar tillståndet för huruvida retur används."
 
-#: ../src/gui/socialwindow.cpp:566
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
-msgid "Accept Guild Invite"
-msgstr "Acceptera gruppinbjudan"
+msgid "Command: /unignore <player>"
+msgstr "Kommando: /item <alternativ>"
 
-#: ../src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Acceptera gruppinbjudan"
+#: src/commandhandler.cpp:301
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:466
-#, fuzzy, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Accepterade injudan från %s."
+#: src/commandhandler.cpp:306
+msgid "Command: /where"
+msgstr "Kommando: /where"
 
-#: ../src/gui/socialwindow.cpp:447
-#, fuzzy, c-format
-msgid "Accepted party invite from %s."
-msgstr "Accepterade injudan från %s."
+#: src/commandhandler.cpp:307
+msgid "This command displays the name of the current map."
+msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
 
-#: ../src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Accepterar handelserbjudanden"
+#: src/commandhandler.cpp:311
+msgid "Command: /who"
+msgstr "Kommando: /who"
 
-#: ../src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Accepterar byteshandelsförfrågningar."
+#: src/commandhandler.cpp:312
+msgid "This command displays the number of players currently online."
+msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
+#: src/commandhandler.cpp:318
+msgid "Type /help for a list of commands."
+msgstr "Skriv /help för en lista med kommandon."
+
+#: src/commandhandler.cpp:384
+msgid "Cannot send empty whispers!"
+msgstr "Behöver en text att viska!"
+
+#: src/commandhandler.cpp:392
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
+"Kan inte skapa viskningsflik för smeknamnet \"%s\"! Antingen existerar "
+"fliken redan eller så försöker du viska till dig själv."
 
-#: ../src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Hantering av konto och karaktärer"
+#: src/commandhandler.cpp:406
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Skickar förfrågan att gå in i chattkanalen %s."
 
-#: ../src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Account banned"
-msgstr "Konto raderat"
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Du måste ange gruppens namn."
 
-#: ../src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Account banned."
-msgstr "Konto raderat"
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
+msgid "Please specify a name."
+msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:162
-#, fuzzy
-msgid "Account expired."
-msgstr "Konto raderat"
+#: src/commandhandler.cpp:450
+msgid "Return toggles chat."
+msgstr "Retur visar/döljer chattfönstret."
 
-#: ../src/net/manaserv/loginhandler.cpp:124
-#: ../src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Kontot är inte anslutet. Var god logga in först."
+#: src/commandhandler.cpp:450
+msgid "Message closes chat."
+msgstr "Meddelande stänger chattfönstret."
 
-#: ../src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Kontot kunde inte hittas. Var vänlig att logga in på nytt."
+#: src/commandhandler.cpp:459
+msgid "Return now toggles chat."
+msgstr "Retur växlar nu chattfönstrets synlighet."
 
-#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
-msgstr "Konto: %s"
+#: src/commandhandler.cpp:463
+msgid "Message now closes chat."
+msgstr "Meddelanden stänger nu chattfönstret."
 
-#: ../src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Lägg till"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:171
-#, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|Använd namn i chatt@@"
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
+msgid "Player already ignored!"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
+#: src/commandhandler.cpp:522
 #, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Nämn i chattfönstret@@"
+msgid "Player successfully ignored!"
+msgstr "Grupp skapad."
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Smidighet"
+#: src/commandhandler.cpp:524
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "Smidighet %+d"
+#: src/commandhandler.cpp:539
+msgid "Player wasn't ignored!"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Smidighet:"
+#: src/commandhandler.cpp:544
+msgid "Player no longer ignored!"
+msgstr ""
 
-#: ../src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Godkänn handel"
+#: src/commandhandler.cpp:546
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: ../src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Godkänt. Väntar…"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Alternativ till /%s är �yes�, �no�, �true�, �false�, �1�, �0�."
 
-#: ../src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "Alla"
+#: src/game.cpp:172
+msgid "General"
+msgstr "Allmänt"
 
-#: ../src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Tillåt byteshandel"
+#: src/game.cpp:342
+#, fuzzy
+msgid "Screenshot saved as "
+msgstr "Skärmbild sparades till ~/"
 
-#: ../src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Tillåt viskningar"
+#: src/game.cpp:347
+msgid "Saving screenshot failed!"
+msgstr "Kunde inte spara skärmbild!"
 
-#: ../src/net/manaserv/loginhandler.cpp:90
-#: ../src/net/manaserv/loginhandler.cpp:269
+#: src/game.cpp:378
 #, fuzzy
-msgid "Already logged in."
-msgstr "Redan inloggad"
+msgid "The connection to the server was lost."
+msgstr ""
+"Förbindelsen till servern förlorades, programmet kommer nu att avslutas."
 
-#: ../src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Loggar chattmeddelanden till fil."
+#: src/game.cpp:382
+msgid "Network Error"
+msgstr "Nätverksfel"
 
-#: ../src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Omgivande FX"
+#: src/game.cpp:721
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorerar handelserbjudanden"
 
-#: ../src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "Omgivande FX"
+#: src/game.cpp:726
+msgid "Accepting incoming trade requests"
+msgstr "Accepterar handelserbjudanden"
+
+#: src/game.cpp:954
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Kunde inte ladda karta"
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: src/game.cpp:955
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "En okänd medlem försökte säga: %s"
+msgid "Error while loading %s"
+msgstr "Kunde inte ladda %s"
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Tillintetgjord."
+#: src/gui/beingpopup.cpp:76
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Grupp (%s)"
 
-#: ../src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Verkställ"
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Köp"
 
-#: ../src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr "Ändringar i OpenGL kräver omstart."
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Pris: %s / Totalt: %s"
 
-#: ../src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
+msgid "+"
 msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Är du säker på att du vill ta bort den här karaktären?"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
+msgid "-"
+msgstr ""
 
-#: ../src/gui/socialwindow.cpp:168
-#, fuzzy, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Är du säker på att du vill avsluta?"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Avsluta"
 
-#: ../src/gui/socialwindow.cpp:247
-#, fuzzy, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Är du säker på att du vill avsluta?"
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
+msgid "Max"
+msgstr "Max"
 
-#: ../src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Tilldela"
+#: src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Affär"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Attackera"
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Sälj"
+
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Ändra epostadress"
 
-#: ../src/resources/itemdb.cpp:53
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
-msgid "Attack %+d"
-msgstr "Attack %+d"
+msgid "Account: %s"
+msgstr "Konto: %s"
+
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
+msgstr "Ange den nya epostadressen två gånger:"
 
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: src/gui/changeemaildialog.cpp:127
 #, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Attack %+d"
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Användarnamnet måste vara minst %d tecken långt."
 
-#: ../src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "Närvaro loggades till fil."
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Användarnamnet måste vara kortare än %d tecken."
 
-#: ../src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Ljud"
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "Den nya epostadressen används redan."
 
-#: ../src/net/tmwa/generalhandler.cpp:129
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
+msgid "Change Password"
+msgstr "Ändra lösenord"
+
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
-msgid "Authentication failed."
-msgstr "Behörighetskontroll misslyckades"
+msgid "Type new password twice:"
+msgstr "Ange det nya lösenordet två gånger:"
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:100
+#: src/gui/changepassworddialog.cpp:116
 #, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|Lägg till %s som vän@@"
+msgid "The new password needs to be at least %d characters long."
+msgstr "Lösenordet måste vara minst %d tecken långt."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Lösenordet måste vara kortare än %d tecken."
 
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Varelse"
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Berövad på ditt liv vilar du numera i frid."
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Skapa karaktär"
 
-#: ../src/playerrelations.cpp:342
-msgid "Blink name"
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Namn:"
+
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:138
-#, fuzzy
-msgid "Blue:"
-msgstr "Blå: "
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
 
-#: ../src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Textbubblor med namn"
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
+msgstr "Hårfärg:"
 
-#: ../src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Textbubblor utan namn"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
+msgstr "Frisyr:"
 
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Köp"
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
+msgid "Create"
+msgstr "Skapa"
 
-#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Kalibrera"
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "Man"
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
-#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
-#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
-#: ../src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Avbryt"
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "Kvinna"
 
-#: ../src/commandhandler.cpp:422
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"Kan inte skapa viskningsflik för smeknamnet \"%s\"! Antingen existerar "
-"fliken redan eller så försöker du viska till dig själv."
+msgid "Please distribute %d points"
+msgstr "Var vänlig fördela %d poäng"
 
-#: ../src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "Ditt namn måste vara minst 4 tecken långt."
 
-#: ../src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
-msgstr ""
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
+msgstr "Karaktärens värden okej"
 
-#: ../src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "Kan inte skicka ett tomt chattmeddelande!"
+#: src/gui/charcreatedialog.cpp:256
+#, c-format
+msgid "Please remove %d points"
+msgstr "Var vänlig ta bort %d poäng"
 
-#: ../src/commandhandler.cpp:401
-msgid "Cannot send empty whispers!"
-msgstr "Behöver en text att viska!"
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Bekräfta borttagning av karaktär"
 
-#: ../src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Kan inte skrika!"
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "Kan inte använda ID"
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr "Hantering av konto och karaktärer"
 
-#: ../src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Ändra"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: ../src/gui/charselectdialog.cpp:150
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Avregistrera"
+
+#: src/gui/charselectdialog.cpp:150
 #, fuzzy
 msgid "Change Email"
 msgstr "Ändra epostadress"
 
-#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Ändra epostadress"
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Ta bort"
 
-#: ../src/gui/worldselectdialog.cpp:76
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
-msgid "Change Login"
-msgstr "Ändra"
+msgid "Choose"
+msgstr "Stäng"
 
-#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Ändra lösenord"
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
+msgid "(empty)"
+msgstr ""
 
-#: ../src/gui/login.cpp:62
-#, fuzzy
-msgid "Change Server"
-msgstr "Server"
+#: src/gui/chat.cpp:88
+msgid "Chat"
+msgstr "Chatt"
 
-#: ../src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "Förändringar kommer att börja gälla när du byter karta."
+#: src/gui/chat.cpp:311
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
+msgstr "%d spelare är närvarande."
 
-#: ../src/client.cpp:813
-#, fuzzy
-msgid "Changing game servers"
-msgstr "Server"
+#: src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Närvaro loggades till fil."
 
-#: ../src/gui/setup_video.cpp:460
-#, fuzzy
-msgid "Changing to OpenGL"
-msgstr "Ändrar OpenGL"
+#: src/gui/chat.cpp:493
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Viskar till %s: %s"
 
-#: ../src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Ja"
+
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Nej"
+
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
 msgstr ""
-"Operatörer kan sparka ut och ge operatörsstatus till andra spelare i "
-"chattkanalen."
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "Chattkanaler stöds inte!"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Karaktär borttagen."
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: ../src/gui/statuswindow.cpp:238
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
 #, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Karaktärens värden okej"
+msgid "Music: %s"
+msgstr "Ämne: %s"
 
-#: ../src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Karaktärens värden okej"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Namn: %s"
 
-#: ../src/net/manaserv/charhandler.cpp:143
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Användarnamnet finns redan"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "Minikarta"
 
-#: ../src/net/manaserv/charhandler.cpp:155
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Karaktärens värden okej"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:158
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Karaktärens värden okej"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Partikeleffekter"
 
-#: ../src/gui/chat.cpp:87
-msgid "Chat"
-msgstr "Chatt"
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Partikeldetaljer"
 
-#: ../src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Chattfönster"
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Omgivande FX"
 
-#: ../src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Kan inte skicka chattmeddelande!"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Utrustning"
 
-#: ../src/gui/charselectdialog.cpp:380
-#, fuzzy
-msgid "Choose"
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
+msgid "Unequip"
+msgstr "Avrusta"
+
+#: src/gui/help.cpp:37
+msgid "Help"
+msgstr "Hjälp"
+
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
+msgid "Close"
 msgstr "Stäng"
 
-#: ../src/gui/worldselectdialog.cpp:77
-#, fuzzy
-msgid "Choose World"
-msgstr "Välj din server"
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inventarium"
 
-#: ../src/gui/serverdialog.cpp:196
-#, fuzzy
-msgid "Choose Your Server"
-msgstr "Välj din server"
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Lagring"
 
-#: ../src/gui/socialwindow.cpp:544
-#, fuzzy
-msgid "Choose your guild's name."
-msgstr "Välj din server"
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Utrymme:"
 
-#: ../src/gui/socialwindow.cpp:630
-#, fuzzy
-msgid "Choose your party's name."
-msgstr "Välj din server"
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
+msgid "Equip"
+msgstr "Utrusta"
 
-#: ../src/gui/npcdialog.cpp:98
-msgid "Clear log"
-msgstr ""
+#: src/gui/inventorywindow.cpp:88
+msgid "Use"
+msgstr "Använd"
 
-#: ../src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
 msgstr ""
 
-#: ../src/net/manaserv/loginhandler.cpp:263
-#: ../src/net/manaserv/loginhandler.cpp:300
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Du har en för gammal version av klienten"
-
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
-msgid "Close"
-msgstr "Stäng"
+msgid "Drop..."
+msgstr "Släpp"
 
-#: ../src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Färger"
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
+msgid "Split"
+msgstr "Dela"
 
-#: ../src/commandhandler.cpp:221
-msgid "Command: /announce <msg>"
-msgstr "Kommando: /announce <text>"
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
 
-#: ../src/commandhandler.cpp:274
-#, fuzzy
-msgid "Command: /away"
-msgstr "Kommando: /who"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
+msgstr "Vikt:"
 
-#: ../src/commandhandler.cpp:271
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Kommando: /w <spelare> <meddelande>"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Lagra"
 
-#: ../src/commandhandler.cpp:228
-msgid "Command: /clear"
-msgstr "Kommando: /clear"
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Hämta"
 
-#: ../src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Kommando: /close"
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
+msgid "Drop"
+msgstr "Släpp"
 
-#: ../src/commandhandler.cpp:279
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Kommando: /create <grupp>"
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
+msgid "OK"
+msgstr "Okej"
 
-#: ../src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Kommando: /exp"
+#: src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Alla"
 
-#: ../src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Kommando: /exp <alternativ>"
+#: src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Välj antal föremål att handla med."
 
-#: ../src/commandhandler.cpp:209
-msgid "Command: /help"
-msgstr "Kommando: /help"
+#: src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Välj antal föremål att släppa."
 
-#: ../src/commandhandler.cpp:212
-msgid "Command: /help <command>"
-msgstr "Kommando: /help <kommando>"
+#: src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Välj antal att lagra."
 
-#: ../src/gui/widgets/whispertab.cpp:88
-#, fuzzy
-msgid "Command: /ignore"
-msgstr "Kommando: /item"
+#: src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Välj antal att hämta."
 
-#: ../src/commandhandler.cpp:233
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Kommando: /item <alternativ>"
+#: src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Välj antal föremål att dela."
 
-#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Kommando: /invite <spelare>"
+#: src/gui/itempopup.cpp:137
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Vikt: "
 
-#: ../src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Kommando: /item"
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
+msgid "Login"
+msgstr "Användarnamn"
 
-#: ../src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Kommando: /item <alternativ>"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Remember username"
+msgstr "Kom ihåg användarnamnet"
 
-#: ../src/commandhandler.cpp:239
-msgid "Command: /join <channel>"
-msgstr "Kommando: /join <chattkanal>"
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "Registrera"
 
-#: ../src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Kommando: /kick <spelare>"
+#: src/gui/login.cpp:62
+#, fuzzy
+msgid "Change Server"
+msgstr "Server"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Kommando: /leave"
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Upplocksdelning avaktiverad."
 
-#: ../src/commandhandler.cpp:245
-msgid "Command: /list"
-msgstr "Kommando: /list"
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
 
-#: ../src/commandhandler.cpp:250
-msgid "Command: /me <message>"
-msgstr "Kommando: /me <meddelande>"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Karta"
 
-#: ../src/commandhandler.cpp:255
-msgid "Command: /msg <nick> <message>"
-msgstr "Kommando: /msg <spelare> <meddelande>"
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Kommando: /op <spelare>"
+#: src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Väntar på server"
 
-#: ../src/commandhandler.cpp:284
-msgid "Command: /party <nick>"
-msgstr "Kommando: /party <spelare>"
+#: src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Nästa"
 
-#: ../src/commandhandler.cpp:291
-msgid "Command: /present"
-msgstr "Kommando: /present"
+#: src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Vidare"
 
-#: ../src/commandhandler.cpp:265
-msgid "Command: /q <nick>"
-msgstr "Kommando: /q <spelare>"
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: ../src/commandhandler.cpp:264
-msgid "Command: /query <nick>"
-msgstr "Kommando: /query <spelare>"
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
 
-#: ../src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Kommando: /quit"
+#: src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Återställ"
 
-#: ../src/commandhandler.cpp:301
-msgid "Command: /record"
-msgstr "Kommando: /record"
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:208
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Nästa"
 
-#: ../src/commandhandler.cpp:298
-msgid "Command: /record <filename>"
-msgstr "Kommando: /record <filnamn>"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Till:"
 
-#: ../src/commandhandler.cpp:312
-msgid "Command: /toggle"
-msgstr "Kommando: /toggle"
+#: src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Skicka"
 
-#: ../src/commandhandler.cpp:306
-msgid "Command: /toggle <state>"
-msgstr "Kommando: /toggle <tillstånd>"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+"Kunde inte skicka brevet eftersom antingen avsändaren eller brevet självt är "
+"ogiltigt."
 
-#: ../src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Kommando: /topic <meddelande>"
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
+#: src/gui/outfitwindow.cpp:70
 #, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Kommando: /item <alternativ>"
+msgid "Unequip first"
+msgstr "Avrusta"
 
-#: ../src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Kommando: /users"
+#: src/gui/popupmenu.cpp:83
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Byteshandlar med %s"
 
-#: ../src/commandhandler.cpp:257
-msgid "Command: /w <nick> <message>"
-msgstr "Kommando: /w <spelare> <meddelande>"
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Attack %+d"
 
-#: ../src/commandhandler.cpp:323
-msgid "Command: /where"
-msgstr "Kommando: /where"
+#: src/gui/popupmenu.cpp:91
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Viskning"
 
-#: ../src/commandhandler.cpp:256
-msgid "Command: /whisper <nick> <message>"
-msgstr "Kommando: /whisper <spelare> <meddelande>"
+#: src/gui/popupmenu.cpp:100
+#, fuzzy, c-format
+msgid "Befriend %s"
+msgstr "@@friend|Lägg till %s som vän@@"
 
-#: ../src/commandhandler.cpp:328
-msgid "Command: /who"
-msgstr "Kommando: /who"
+#: src/gui/popupmenu.cpp:105
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Förbisedd"
 
-#: ../src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Färdig"
+#: src/gui/popupmenu.cpp:108
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Ignorerad"
 
-#: ../src/playerrelations.cpp:312
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Ignorera %s fullständigt@@"
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:117
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Ignorera %s fullständigt@@"
 
-#: ../src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Bekräfta borttagning av karaktär"
-
-#: ../src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Bekräfta:"
-
-#: ../src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Bekräftat. Väntar…"
+#: src/gui/popupmenu.cpp:130
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
+msgstr "@@guild|Bjud in %s till ditt gille@@"
 
-#: ../src/keyboardconfig.cpp:184
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
+msgid "Invite %s to join your party"
+msgstr "@@party|Bjud in %s till din grupp@@"
 
-#: ../src/gui/serverdialog.cpp:233
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
-msgid "Connect"
-msgstr "Ansluter..."
+msgid "Kick player"
+msgstr "Kunde inte sparka ut!"
 
-#: ../src/client.cpp:655
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Ansluter till kartservern..."
+#: src/gui/popupmenu.cpp:150
+#, fuzzy, c-format
+msgid "Talk to %s"
+msgstr "@@talk|Prata med %s@@"
 
-#: ../src/client.cpp:803
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
-msgid "Connecting to the game server"
-msgstr "Ansluter till kartservern..."
-
-#: ../src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Ansluter..."
+msgid "Kick monster"
+msgstr "@@admin-kick|Sparka monster@@"
 
-#: ../src/net/tmwa/network.cpp:414
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Ansluter till kartservern..."
-
-#: ../src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr ""
+msgid "Add name to chat"
+msgstr "@@name|Använd namn i chatt@@"
 
-#: ../src/gui/statuswindow.cpp:244
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Färdighetspoäng: %d"
+msgid "Pick up %s"
+msgstr "Plocka upp"
 
-#: ../src/game.cpp:950
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
-msgid "Could Not Load Map"
-msgstr "Kunde inte ladda karta"
+msgid "Add to chat"
+msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: ../src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "Kunde inte skapa grupp."
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Byt server"
 
-#: ../src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
-msgstr ""
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Byt karaktär"
 
-#: ../src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Kan inte ansluta till gruppen!"
+#: src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Avslutar chattloggning."
 
-#: ../src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "Kunde inte stjäla något..."
+#: src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Loggar inte chattmeddelanden till fil."
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Skapa"
+#: src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Loggar chattmeddelanden till fil."
 
-#: ../src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Skapa karaktär"
+#: src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Börjar logga chattmeddelanden…"
 
-#: ../src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Skapa gille"
+#: src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Misslyckades att börja logga chattmeddelanden."
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
-#, fuzzy
-msgid "Create Party"
-msgstr "Skapa karaktär"
+#: src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Loggar chattmeddelanden…"
 
-#: ../src/gui/socialwindow.cpp:507
-#, fuzzy, c-format
-msgid "Creating guild called %s."
-msgstr "Kunde inte skapa gille."
+#: src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Sluta logga chattmeddelanden"
 
-#: ../src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Bekräfta:"
+
+#: src/gui/register.cpp:100
+msgid "Email:"
+msgstr "E-post:"
 
-#: ../src/gui/socialwindow.cpp:529
+#: src/gui/register.cpp:166
 #, c-format
-msgid "Creating party called %s."
-msgstr ""
+msgid "The username needs to be at least %d characters long."
+msgstr "Användarnamnet måste vara minst %d tecken långt."
 
-#: ../src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
-msgstr ""
+#: src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Användarnamnet måste vara kortare än %d tecken."
 
-#: ../src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Kritisk träff"
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Lösenordet måste vara minst %d tecken långt."
 
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+msgid "The password needs to be less than %d characters long."
+msgstr "Lösenordet måste vara kortare än %d tecken."
 
-#: ../src/gui/serverdialog.cpp:234
-#, fuzzy
-msgid "Custom Server"
-msgstr "Särskild muspekare"
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Lösenorden stämmer inte överens."
 
-#: ../src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "Särskild muspekare"
+#: src/gui/serverdialog.cpp:197
+#, fuzzy
+msgid "Choose Your Server"
+msgstr "Välj din server"
 
-#: ../src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
-msgstr ""
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Server:"
 
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr ""
+#: src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Port:"
 
-#: ../src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Felsökningsfönster"
+#: src/gui/serverdialog.cpp:208
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
 
-#: ../src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Förval"
+#: src/gui/serverdialog.cpp:229
+#, fuzzy
+msgid "Connect"
+msgstr "Ansluter..."
 
-#: ../src/net/tmwa/generalhandler.cpp:225
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
-msgid "Defense"
-msgstr "Försvar:"
+msgid "Custom Server"
+msgstr "Särskild muspekare"
+
+#: src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Var vänlig skriv både adressen och porten till en server."
 
-#: ../src/resources/itemdb.cpp:54
+#: src/gui/serverdialog.cpp:441
 #, c-format
-msgid "Defense %+d"
-msgstr "Försvar %+d"
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:93
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
-msgid "Delay:"
-msgstr "Fördröjning: "
+msgid "Waiting for server..."
+msgstr "Väntar på server"
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Ta bort"
+#: src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Skicklighet"
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Skicklighet %+d"
+msgid "requires v%s"
+msgstr ""
 
-#: ../src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Skicklighet:"
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Ljud"
 
-#: ../src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:105
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "Förbisedd"
+#: src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Ljud"
 
-#: ../src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Förbisedd"
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Volym för ljudeffekter"
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Vill du att dina tillhörigheter ska identifieras?"
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Musikvolym"
 
-#: ../src/gui/setup_audio.cpp:43
-msgid "Download music"
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Ingen text"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: ../src/gui/serverdialog.cpp:442
-#, c-format
-msgid "Downloading server list...%2.2f%%"
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
-msgid "Drop"
-msgstr "Släpp"
+#: src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "Så här ser färgen ut"
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
-#, fuzzy
-msgid "Drop..."
-msgstr "Släpp"
+#: src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Färger"
 
-#: ../src/net/tmwa/generalhandler.cpp:145
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
-msgid "Duplicated login."
-msgstr "Dubbel inloggning"
+msgid "Type:"
+msgstr "Typ: "
 
-#: ../src/client.cpp:905
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Statisk"
+
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Pulserande"
+
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Regnbåge"
+
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Spektrum"
+
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
-msgid "Email Change"
-msgstr "Ändra"
+msgid "Delay:"
+msgstr "Fördröjning: "
 
-#: ../src/net/manaserv/loginhandler.cpp:309
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Epostadressen finns redan"
+msgid "Red:"
+msgstr "Röd: "
 
-#: ../src/client.cpp:906
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
-msgid "Email changed successfully!"
-msgstr "Medlem befordrad."
+msgid "Green:"
+msgstr "Grön: "
 
-#: ../src/gui/register.cpp:100
-msgid "Email:"
-msgstr "E-post:"
+#: src/gui/setup_colors.cpp:139
+#, fuzzy
+msgid "Blue:"
+msgstr "Blå: "
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Tangent för smiley %d"
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Verkställ"
 
-#: ../src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr "Smileyfönster"
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Återställ fönster"
 
-#: ../src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Kan inte visa smiley!"
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Klicka på knappen för att starta kalibreringen"
 
-#: ../src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Kalibrera"
 
-#: ../src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr "Aktivera joystick"
 
-#: ../src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Tillåt/neka handel"
-
-#: ../src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: ../src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr ""
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: ../src/client.cpp:715
-msgid "Entering game world"
-msgstr ""
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Stopp"
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
-msgid "Equip"
-msgstr "Utrusta"
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Rotera spaken"
 
-#: ../src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
-msgstr "Utrusta dig med pilar först."
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Tangentbord"
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Utrustning"
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Tilldela"
 
-#: ../src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Utrustningsfönster"
+#: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Tilldela"
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "Fel"
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Förval"
 
-#: ../src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Kunde inte skapa gille."
+#: src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Samma tangent används på flera ställen."
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
-msgid "Error creating updates directory!"
-msgstr "Kunde inte skapa katalog för uppdateringar!"
+#: src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Namn"
 
-#: ../src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Kommando: /join <chattkanal>"
+#: src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Relation"
 
-#: ../src/gui/serverdialog.cpp:456
-msgid "Error retreiving server list!"
-msgstr ""
+#: src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutral"
 
-#: ../src/game.cpp:951
-#, c-format
-msgid "Error while loading %s"
-msgstr "Kunde inte ladda %s"
+#: src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Vän"
 
-#: ../src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "EP:"
+#: src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Förbisedd"
 
-#: ../src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "XP-notifiering"
+#: src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Ignorerad"
 
-#: ../src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "EP:"
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
+msgid "???"
+msgstr "???"
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr "Fördelning av erfarenhet inaktiverad."
+#: src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Tillåt byteshandel"
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr "Fördelning av erfarenhet aktiverad."
+#: src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Tillåt viskningar"
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr "Fördelning av erfarenhet ej möjlig."
+#: src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Visa alla viskningar i egna flikar"
 
-#: ../src/net/tmwa/gui/partytab.cpp:176
+#: src/gui/setup_players.cpp:233
 #, fuzzy
-msgid "Experience sharing unknown."
-msgstr "Fördelning av erfarenhet aktiverad."
+msgid "Show gender"
+msgstr "Visa namn"
 
-#: ../src/gui/setup_video.cpp:238
+#: src/gui/setup_players.cpp:235
 #, fuzzy
-msgid "FPS limit:"
-msgstr "FPS-gräns:"
-
-#: ../src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Kunde inte lägga till föremål av okänd anledning."
+msgid "Enable Chat log"
+msgstr "Kan inte sälja."
 
-#: ../src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Kunde inte lägga till föremål. Bytespartnern har inget ledigt utrymme."
+#: src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Spelare"
 
-#: ../src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Kunde inte lägga till föremål. Bytespartnern är överfull."
+#: src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "Vid ignorering:"
 
-#: ../src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags "
-"sak flera gånger."
+#: src/gui/setup_video.cpp:134
+msgid "Tiny"
+msgstr "Pytteliten"
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Kan inte skapa karaktär. Troligtvis används namnet av någon annan."
+#: src/gui/setup_video.cpp:135
+msgid "Small"
+msgstr "Liten"
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "Kunde inte ta bort karaktär."
+#: src/gui/setup_video.cpp:136
+msgid "Medium"
+msgstr "Mellan"
 
-#: ../src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Kunde inte befordra medlem."
+#: src/gui/setup_video.cpp:137
+msgid "Large"
+msgstr "Stor"
 
-#: ../src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr ""
-"Kunde inte skicka brevet eftersom antingen avsändaren eller brevet självt är "
-"ogiltigt."
+#: src/gui/setup_video.cpp:163
+msgid "No text"
+msgstr "Ingen text"
 
-#: ../src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Misslyckades att börja logga chattmeddelanden."
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Text"
 
-#: ../src/gui/setup_video.cpp:434
-#, fuzzy
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "läge och återgång till det gamla läget misslyckades också!"
+#: src/gui/setup_video.cpp:165
+msgid "Bubbles, no names"
+msgstr "Textbubblor utan namn"
 
-#: ../src/gui/setup_video.cpp:428
-#, fuzzy
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "läge och återgång till det gamla läget misslyckades också!"
+#: src/gui/setup_video.cpp:166
+msgid "Bubbles with names"
+msgstr "Textbubblor med namn"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
-msgid "Failed to use item."
-msgstr "Kunde inte använda föremål."
+#: src/gui/setup_video.cpp:178
+msgid "off"
+msgstr "av"
 
-#: ../src/client.cpp:927
-msgid "Farewell, come back any time..."
-msgstr ""
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
+msgid "low"
+msgstr "låg"
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
-msgid "Female"
-msgstr "Kvinna"
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
+msgid "high"
+msgstr "hög"
 
-#: ../src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "GÃ¥ till muspekaren"
+#: src/gui/setup_video.cpp:193
+msgid "medium"
+msgstr "medium"
 
-#: ../src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Avslutar chattloggning."
+#: src/gui/setup_video.cpp:195
+msgid "max"
+msgstr "maximal"
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:217
+msgid "Full screen"
+msgstr "Helskärm"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
+#: src/gui/setup_video.cpp:218
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Typsnittsgrad"
+#: src/gui/setup_video.cpp:219
+msgid "Custom cursor"
+msgstr "Särskild muspekare"
 
-#: ../src/commandhandler.cpp:205
-msgid "For more information, type /help <command>."
-msgstr "Skriv /help <kommando> för mer information."
+#: src/gui/setup_video.cpp:221
+msgid "Visible names"
+msgstr "Synliga namn"
 
-#: ../src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Vän"
+#: src/gui/setup_video.cpp:223
+msgid "Particle effects"
+msgstr "Partikeleffekter"
 
-#: ../src/gui/setup_video.cpp:219
-msgid "Full screen"
-msgstr "Helskärm"
+#: src/gui/setup_video.cpp:225
+#, fuzzy
+msgid "Show own name"
+msgstr "Visa namn"
 
-#: ../src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "GM-namn"
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
 
-#: ../src/net/tmwa/gamehandler.cpp:101
-#, fuzzy
-msgid "Game"
-msgstr "Namn"
+#: src/gui/setup_video.cpp:227
+msgid "Show pickup notification"
+msgstr "Visa erhållna saker"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Spelet är slut!"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
+msgid "in chat"
+msgstr "i chattfönster"
 
-#: ../src/game.cpp:169
-msgid "General"
-msgstr "Allmänt"
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
+msgid "as particle"
+msgstr "som partikel"
 
-#: ../src/gui/widgets/chattab.cpp:126
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Globalt meddelande från %s:"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "FPS limit:"
+msgstr "FPS-gräns:"
 
-#: ../src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Globalt meddelande:"
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
-msgstr "Kopplades från servern!"
+#: src/gui/setup_video.cpp:250
+msgid "Video"
+msgstr "Video"
 
-#: ../src/gui/setup_colors.cpp:123
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Green:"
-msgstr "Grön: "
+msgid "Show damage"
+msgstr "Visa namn"
+
+#: src/gui/setup_video.cpp:258
+msgid "Overhead text"
+msgstr "Text ovanför huvudet"
 
-#: ../src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Genomskinlighet"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Gille"
-
-#: ../src/gui/socialwindow.cpp:143
-#, fuzzy, c-format
-msgid "Guild %s quit requested."
-msgstr "Gille skapat."
-
-#: ../src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Gille"
+#: src/gui/setup_video.cpp:260
+msgid "Ambient FX"
+msgstr "Omgivande FX"
 
-#: ../src/gui/socialwindow.cpp:543
+#: src/gui/setup_video.cpp:261
 #, fuzzy
-msgid "Guild Name"
-msgstr "Gille"
-
-#: ../src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Gille skapat."
+msgid "Particle detail"
+msgstr "Partikeldetaljer"
 
-#: ../src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
-msgstr ""
+#: src/gui/setup_video.cpp:262
+msgid "Font size"
+msgstr "Typsnittsgrad"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:89
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
-msgid "Guild name is missing."
-msgstr "Du måste ange gruppens namn."
+msgid "None"
+msgstr "Nej"
 
-#: ../src/gui/statuswindow.cpp:203
+#: src/gui/setup_video.cpp:426
 #, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: ../src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "Hälsa %+d"
-
-#: ../src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "HP:"
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "läge och återgång till det gamla läget misslyckades också!"
 
-#: ../src/gui/charcreatedialog.cpp:74
+#: src/gui/setup_video.cpp:432
 #, fuzzy
-msgid "Hair color:"
-msgstr "Hårfärg:"
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr "läge och återgång till det gamla läget misslyckades också!"
 
-#: ../src/gui/charcreatedialog.cpp:77
+#: src/gui/setup_video.cpp:443
 #, fuzzy
-msgid "Hair style:"
-msgstr "Frisyr:"
+msgid "Switching to Full Screen"
+msgstr "Byte till helskärm"
 
-#: ../src/gui/help.cpp:37
-msgid "Help"
-msgstr "Hjälp"
+#: src/gui/setup_video.cpp:444
+msgid "Restart needed for changes to take effect."
+msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: ../src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Hjälpfönster"
+#: src/gui/setup_video.cpp:458
+#, fuzzy
+msgid "Changing to OpenGL"
+msgstr "Ändrar OpenGL"
 
-#: ../src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Dölj fönster"
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Öh? Vad är det där?"
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Jag antar att det kunde gått bättre."
+#: src/gui/setup_video.cpp:467
+msgid "Applying change to OpenGL requires restart."
+msgstr "Ändringar i OpenGL kräver omstart."
 
-#: ../src/commandhandler.cpp:241
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Om <chattkanal> inte existerar, skapas den."
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Fördelning av erfarenhet inaktiverad."
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
 msgstr ""
-"Om <spelare> innehåller mellanslag, måste du sätta citattecken (\") runt det."
 
-#: ../src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
 msgstr ""
-"Om du inte vore så livfull skulle du vara blomnäring vid det här laget."
 
-#: ../src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Om du är den sista spelaren i chattkanalen tas den bort."
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
+#, fuzzy
+msgid "Screen Resolution Changed"
+msgstr "Skärmupplösning ändrad"
 
-#: ../src/gui/popupmenu.cpp:108
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "Ignorerad"
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
+msgid "Restart your client for the change to take effect."
+msgstr "Starta om din klient för att ändringen ska börja gälla."
 
-#: ../src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "Ignorera inmatning 1"
+#: src/gui/setup_video.cpp:579
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "Ignorera inmatning 2"
+#: src/gui/setup_video.cpp:612
+#, fuzzy
+msgid "Particle Effect Settings Changed."
+msgstr "Inställningar för partikeleffekter ändrade."
 
-#: ../src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Ignorerad"
+#: src/gui/setup_video.cpp:613
+msgid "Changes will take effect on map change."
+msgstr "Förändringar kommer att börja gälla när du byter karta."
 
-#: ../src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorerar handelserbjudanden"
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Färdigheter"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorerar byteshandelsförfrågningar."
+#: src/gui/skilldialog.cpp:223
+msgid "Up"
+msgstr "Upp"
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Information"
+#: src/gui/skilldialog.cpp:269
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Färdighetspoäng: %d"
 
-#: ../src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "Stoppa i mynt för att fortsätta."
+#: src/gui/skilldialog.cpp:351
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Färdighetspoäng: %d"
 
-#: ../src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "Otillräckligt med HP!"
+#: src/gui/skilldialog.cpp:360
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Färdigheter"
 
-#: ../src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "Otillräckligt med SP!"
+#: src/gui/skilldialog.cpp:442
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Nivå: %d"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Intelligens"
+#: src/gui/skilldialog.cpp:453
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Nivå: %d"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
+#: src/gui/socialwindow.cpp:126
 #, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligens %+d"
-
-#: ../src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Intelligens:"
-
-#: ../src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
-msgstr ""
+#: src/gui/socialwindow.cpp:139
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Gille skapat."
 
-#: ../src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
+#: src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
+#: src/gui/socialwindow.cpp:154
+#, c-format
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: ../src/client.cpp:1244
-#, fuzzy, c-format
-msgid "Invalid update host: %s"
-msgstr "Ogiltig uppdateringsvärd: "
-
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inventarium"
-
-#: ../src/keyboardconfig.cpp:72
-msgid "Inventory Window"
-msgstr "Inventorium"
-
-#: ../src/localplayer.cpp:1254
-#, fuzzy
-msgid "Inventory is full."
-msgstr "Servern är full"
-
-#: ../src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
-msgid "Invite"
-msgstr "Bjud in spelare"
-
-#: ../src/gui/popupmenu.cpp:130
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|Bjud in %s till ditt gille@@"
+msgid "Leave Guild?"
+msgstr "Skapa gille"
 
-#: ../src/gui/popupmenu.cpp:134
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|Bjud in %s till din grupp@@"
-
-#: ../src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Inbjudan skickad."
-
-#: ../src/gui/socialwindow.cpp:128
-#, c-format
-msgid "Invited user %s to guild %s."
-msgstr ""
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Är du säker på att du vill avsluta?"
 
-#: ../src/net/tmwa/partyhandler.cpp:335
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: ../src/net/tmwa/partyhandler.cpp:340
+#: src/gui/socialwindow.cpp:218
 #, c-format
-msgid "Inviting failed, because you can't see a player called %s."
+msgid "Party %s quit requested."
 msgstr ""
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Tangent för snabbåtkomst %d"
-
-#: ../src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Snabbåtkomstfönster"
+#: src/gui/socialwindow.cpp:232
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Bjud in en spelare till din grupp"
 
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
+#: src/gui/socialwindow.cpp:233
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
+#: src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
 msgstr ""
 
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
-msgstr ""
+#: src/gui/socialwindow.cpp:243
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Är du säker på att du vill avsluta?"
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Upplocksdelning avaktiverad."
+#: src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Skapa gille"
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Upplocksdelning aktiverad."
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
+#, fuzzy
+msgid "Create Party"
+msgstr "Skapa karaktär"
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "Upplocksdelning är inte möjligt."
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr ""
 
-#: ../src/net/tmwa/gui/partytab.cpp:141
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
-msgid "Item sharing unknown."
-msgstr "Upplocksdelning aktiverad."
+msgid "Invite"
+msgstr "Bjud in spelare"
 
-#: ../src/gui/statuswindow.cpp:234
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
-msgid "Job"
-msgstr "Jobb:"
+msgid "Leave"
+msgstr "Stor"
 
-#: ../src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Jobb:"
+#: src/gui/socialwindow.cpp:443
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Accepterade injudan från %s."
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
-#, c-format
-msgid "Job: %d"
-msgstr "Jobb: %d"
+#: src/gui/socialwindow.cpp:449
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Avslog inbjudan från %s."
 
-#: ../src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Anslöt dig till grupp."
+#: src/gui/socialwindow.cpp:462
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Accepterade injudan från %s."
 
-#: ../src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: src/gui/socialwindow.cpp:468
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Avslog inbjudan från %s."
 
-#: ../src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Samma tangent används på flera ställen."
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Tangentbord"
+#: src/gui/socialwindow.cpp:504
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Kunde inte skapa gille."
 
-#: ../src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Kunde inte sparka ut!"
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
 
-#: ../src/gui/popupmenu.cpp:163
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|Sparka monster@@"
+msgid "Guild Name"
+msgstr "Gille"
 
-#: ../src/gui/popupmenu.cpp:141
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
-msgid "Kick player"
-msgstr "Kunde inte sparka ut!"
+msgid "Choose your guild's name."
+msgstr "Välj din server"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Klarade av att sparka ut!"
+#: src/gui/socialwindow.cpp:554
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: ../src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Stor"
+#: src/gui/socialwindow.cpp:559
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s har bjudit in dig till %ss grupp."
 
-#: ../src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
-msgid "Leave"
-msgstr "Stor"
+msgid "Accept Guild Invite"
+msgstr "Acceptera gruppinbjudan"
+
+#: src/gui/socialwindow.cpp:576
+msgid "Received party request, but one already exists."
+msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: ../src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
-msgid "Leave Guild?"
-msgstr "Skapa gille"
+msgid "You have been invited you to join a party."
+msgstr "%s har bjudit in dig till sin grupp."
 
-#: ../src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
-msgstr ""
+#: src/gui/socialwindow.cpp:589
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s har bjudit in dig till %ss grupp."
 
-#: ../src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Nivå: %d"
+#: src/gui/socialwindow.cpp:597
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s har bjudit in dig till sin grupp."
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: src/gui/socialwindow.cpp:602
 #, c-format
-msgid "Level: %d"
-msgstr "Nivå: %d"
+msgid "%s has invited you to join the %s party."
+msgstr "%s har bjudit in dig till %ss grupp."
 
-#: ../src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Skickar förfrågan att gå in i chattkanalen %s."
+#: src/gui/socialwindow.cpp:610
+msgid "Accept Party Invite"
+msgstr "Acceptera gruppinbjudan"
 
-#: ../src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Kritisk träff"
+#: src/gui/socialwindow.cpp:621
+msgid "Cannot create party. You are already in a party"
+msgstr ""
 
-#: ../src/gui/userpalette.cpp:107
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "Spelare slår monster"
+msgid "Party Name"
+msgstr "Grupp"
 
-#: ../src/gui/userpalette.cpp:111
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
-msgid "Local Player Miss"
-msgstr "Kom ihåg spelarlista"
+msgid "Choose your party's name."
+msgstr "Välj din server"
 
-#: ../src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
+msgid "Specials"
 msgstr ""
 
-#: ../src/client.cpp:682
-#, fuzzy
-msgid "Logging in"
-msgstr "Användarnamn"
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
+#, c-format
+msgid "Level: %d"
+msgstr "Nivå: %d"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
-msgid "Login"
-msgstr "Användarnamn"
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
+#, c-format
+msgid "Money: %s"
+msgstr "Pengar: %s"
 
-#: ../src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#: src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "HP:"
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Verkar som att som att någon gav dig ditt huvud."
+#: src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "EP:"
 
-#: ../src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Tur"
+#: src/gui/statuswindow.cpp:130
+msgid "MP:"
+msgstr "MP:"
 
-#: ../src/net/tmwa/generalhandler.cpp:106
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
-msgid "Luck %+d"
-msgstr "Tur %+d"
+msgid "Job: %d"
+msgstr "Jobb: %d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Tur:"
+#: src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Jobb:"
 
-#: ../src/gui/skilldialog.cpp:455
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Nivå: %d"
+msgid "Character points: %d"
+msgstr "Karaktärens värden okej"
 
-#: ../src/gui/skilldialog.cpp:444
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Nivå: %d"
-
-#: ../src/net/tmwa/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Attack"
-msgstr "M. attack:"
+msgid "Correction points: %d"
+msgstr "Färdighetspoäng: %d"
 
-#: ../src/net/tmwa/generalhandler.cpp:227
-#, fuzzy
-msgid "M.Defense"
-msgstr "M. försvar:"
+#: src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Föreslå handel"
 
-#: ../src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
+#: src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Bekräftat. Väntar…"
 
-#: ../src/resources/itemdb.cpp:56
-#, c-format
-msgid "MP %+d"
-msgstr "Mana %+d"
+#: src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Godkänn handel"
 
-#: ../src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "MP:"
+#: src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Godkänt. Väntar…"
 
-#: ../src/net/tmwa/chathandler.cpp:190
-#, fuzzy
-msgid "MVP player."
-msgstr "Spelare"
+#: src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Byteshandel: du"
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
-msgid "Male"
-msgstr "Man"
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Byteshandla"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Karta"
+#: src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Lägg till"
 
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Namn: %s"
+msgid "You get %s"
+msgstr "Du får %s."
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Max"
+#: src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Du ger:"
 
-#: ../src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Mellan"
+#: src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Ändra"
 
-#: ../src/gui/socialwindow.cpp:157
-msgid "Member Invite to Guild"
+#: src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags "
+"sak flera gånger."
 
-#: ../src/gui/socialwindow.cpp:236
-#, fuzzy
-msgid "Member Invite to Party"
-msgstr "/party > Bjud in en spelare till din grupp"
-
-#: ../src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Medlem befordrad."
+#: src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "Du har inte tillräckligt med pengar."
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Meddelande"
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Namn: %s"
 
-#: ../src/commandhandler.cpp:480
-msgid "Message closes chat."
-msgstr "Meddelande stänger chattfönstret."
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Uppdaterar..."
 
-#: ../src/commandhandler.cpp:493
-msgid "Message now closes chat."
-msgstr "Meddelanden stänger nu chattfönstret."
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Ansluter..."
 
-#: ../src/keyboardconfig.cpp:75
-msgid "Minimap Window"
-msgstr "Minikarta"
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Spela"
 
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "Minikarta"
+#: src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1  Uppdateringsprocessen är inte avslutad."
 
-#: ../src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Missar"
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1  Det rekommenderar verkligen att"
 
-#: ../src/gui/statuswindow.cpp:224
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
-msgid "Money"
-msgstr "Pengar: %d"
+msgid "##1  you try again later."
+msgstr "##1  du försöker igen senare"
 
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
-#, c-format
-msgid "Money: %s"
-msgstr "Pengar: %s"
+#: src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Färdig"
 
-#: ../src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Monster slår spelare"
+#: src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr ""
+"/users > Visar en lista över de spelare som finns i den aktuella chattkanalen"
 
-#: ../src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Monster"
+#: src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Sätter ämnet för chattkanalen"
 
-#: ../src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Gå nedåt"
+#: src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Lämnar chattkanalen"
 
-#: ../src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Gå åt vänster"
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Gör en spelare till chattkanalsoperatör"
 
-#: ../src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Gå åt höger"
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Sparka ut en spelare från chattkanalen"
 
-#: ../src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Gå uppåt"
+#: src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Kommando: /users"
 
-#: ../src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Musikvolym"
+#: src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Det här kommandot visar alla spelare i den här chattkanalen."
 
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
-#, fuzzy, c-format
-msgid "Music: %s"
-msgstr "Ämne: %s"
+#: src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Kommando: /topic <meddelande>"
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Det här kommandot sätter ämnet till <meddelande>."
 
-#: ../src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPC:er"
+#: src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Kommando: /quit"
 
-#: ../src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Namn"
+#: src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Det här kommandot gör att du lämnar aktuell chattkanal."
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
-#: ../src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Namn:"
+#: src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Om du är den sista spelaren i chattkanalen tas den bort."
 
-#: ../src/gui/unregisterdialog.cpp:51
-#, c-format
-msgid "Name: %s"
-msgstr "Namn: %s"
+#: src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Kommando: /op <spelare>"
 
-#: ../src/gui/ministatus.cpp:157
-msgid "Need"
+#: src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Det här kommandot gör <spelare> till chattkanalsoperatör."
+
+#: src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
+"Operatörer kan sparka ut och ge operatörsstatus till andra spelare i "
+"chattkanalen."
 
-#: ../src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Du måste ange vilken spelare som ska sparkas ut!"
+#: src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Kommando: /kick <spelare>"
+
+#: src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Det här kommandot sparkar ut <spelare> ur chattkanalen."
 
-#: ../src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr "Du måste ange vilken spelare som ska få operatörsstatus!"
 
-#: ../src/game.cpp:372
-msgid "Network Error"
-msgstr "Nätverksfel"
-
-#: ../src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutral"
-
-#: ../src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Den nya epostadressen är felaktig."
-
-#: ../src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Det nya lösenordet stämmer inte överens"
+#: src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Du måste ange vilken spelare som ska sparkas ut!"
 
-#: ../src/net/tmwa/loginhandler.cpp:92
-#, fuzzy
-msgid "New password too short."
-msgstr "Det nya lösenordet är för kort"
+#: src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Globalt meddelande:"
 
-#: ../src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Nästa"
+#: src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Globalt meddelande från %s:"
 
-#: ../src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Nästa chattflik"
+#: src/gui/widgets/chattab.cpp:153
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "%s viskar: "
 
-#: ../src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Nej"
+#: src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Kan inte skicka ett tomt chattmeddelande!"
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
+#: src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
+#: src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Ingen spelserver finns tillgänglig."
-
-#: ../src/net/tmwa/generalhandler.cpp:132
-#, fuzzy
-msgid "No servers available."
-msgstr "Ingen server är tillgänglig"
+#: src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Stänger viskningsfliken"
 
-#: ../src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Ingen text"
+#: src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Kommando: /close"
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Barn, barn. Din karaktär dog egentligen inte. Den… öh… kom till ett bättre "
-"ställe."
+#: src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Det här kommandot stänger aktuell viskningsflik."
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
-msgid "None"
-msgstr "Nej"
+msgid "Command: /ignore"
+msgstr "Kommando: /item"
 
-#: ../src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Loggar inte chattmeddelanden till fil."
+#: src/gui/widgets/whispertab.cpp:90
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
-msgid "Not logged in."
-msgstr "Redan inloggad"
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Det här kommandot startar loggning av chatten till <filnamn>."
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Inget att sälja."
+#: src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Status"
 
-#: ../src/gui/setup_audio.cpp:94
-#, fuzzy
-msgid "Notice"
-msgstr "Ingen text"
+#: src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Genvägar"
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
-msgid "OK"
-msgstr "Okej"
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Välj okej"
 
-#: ../src/net/manaserv/loginhandler.cpp:152
+#: src/gui/worldselectdialog.cpp:76
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Den gamla epostadressen är fel."
+msgid "Change Login"
+msgstr "Ändra"
 
-#: ../src/net/manaserv/loginhandler.cpp:121
-#: ../src/net/tmwa/loginhandler.cpp:89
+#: src/gui/worldselectdialog.cpp:77
 #, fuzzy
-msgid "Old password incorrect."
-msgstr "Det gamla lösenordet är fel"
+msgid "Choose World"
+msgstr "Välj din server"
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr ""
+#: src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Gå uppåt"
 
-#: ../src/net/tmwa/gamehandler.cpp:87
-#, c-format
-msgid "Online users: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Gå nedåt"
 
-#: ../src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Gå åt vänster"
 
-#: ../src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Alternativ till /%s är �yes�, �no�, �true�, �false�, �1�, �0�."
+#: src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Gå åt höger"
 
-#: ../src/main.cpp:43
-msgid "Options:"
-msgstr "Alternativ:"
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Attackera"
 
-#: ../src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Spelare slår monster"
+#: src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Välj & attackera"
 
-#: ../src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Andra spelares namn"
+#: src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Smiley"
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
-#: ../src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
-msgstr ""
+#: src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Prata"
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr ""
+#: src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Sluta attackera"
 
-#: ../src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:48
 #, fuzzy
-msgid "Outfits Window"
-msgstr "Statusfönster"
-
-#: ../src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr "Text ovanför huvudet"
+msgid "Target Monster"
+msgstr "Välj närmaste"
 
-#: ../src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Eget namn"
+#: src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "Välj NPC"
 
-#: ../src/gui/setup_video.cpp:615
-#, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Inställningar för partikeleffekter ändrade."
+#: src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Välj spelare"
 
-#: ../src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Partikeleffekter"
+#: src/keyboardconfig.cpp:51
+msgid "Pickup"
+msgstr "Plocka upp"
 
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Partikeleffekter"
+#: src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Dölj fönster"
 
-#: ../src/gui/setup_video.cpp:263
-#, fuzzy
-msgid "Particle detail"
-msgstr "Partikeldetaljer"
+#: src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Sitt"
 
-#: ../src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Partikeldetaljer"
+#: src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Skärmbild"
 
-#: ../src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Partikeleffekter"
+#: src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Tillåt/neka handel"
 
-#: ../src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Grupp"
+#: src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "GÃ¥ till muspekaren"
 
-#: ../src/gui/socialwindow.cpp:222
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
-msgid "Party %s quit requested."
-msgstr ""
-
-#: ../src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Grupp"
-
-#: ../src/gui/socialwindow.cpp:629
-#, fuzzy
-msgid "Party Name"
-msgstr "Grupp"
-
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Du måste ange gruppens namn."
-
-#: ../src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Grupp skapad."
+msgid "Item Shortcut %d"
+msgstr "Tangent för snabbåtkomst %d"
 
-#: ../src/gui/beingpopup.cpp:76
-#, fuzzy, c-format
-msgid "Party: %s"
-msgstr "Grupp (%s)"
+#: src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Hjälpfönster"
 
-#: ../src/client.cpp:885
-#, fuzzy
-msgid "Password Change"
-msgstr "Lösenord:"
+#: src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Statusfönster"
 
-#: ../src/client.cpp:886
-msgid "Password changed successfully!"
-msgstr ""
+#: src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Inventorium"
 
-#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Lösenord:"
+#: src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Utrustningsfönster"
 
-#: ../src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Lösenorden stämmer inte överens."
+#: src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Färdighetsfönster"
 
-#: ../src/gui/popupmenu.cpp:188
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "Plocka upp"
+#: src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Minikarta"
 
-#: ../src/keyboardconfig.cpp:52
-msgid "Pickup"
-msgstr "Plocka upp"
+#: src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Chattfönster"
 
-#: ../src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "Upplocksnotis"
+#: src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Snabbåtkomstfönster"
 
-#: ../src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Spela"
+#: src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Inställningsfönster"
 
-#: ../src/commandhandler.cpp:545
-msgid "Player already ignored!"
-msgstr ""
+#: src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Felsökningsfönster"
 
-#: ../src/commandhandler.cpp:554
+#: src/keyboardconfig.cpp:79
 #, fuzzy
-msgid "Player could not be ignored!"
-msgstr "Kunde inte viska eftersom ignorerad av spelaren."
+msgid "Social Window"
+msgstr "Färdighetsfönster"
 
-#: ../src/commandhandler.cpp:576
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "Kunde inte viska eftersom ignorerad av spelaren."
+#: src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Smileyfönster"
 
-#: ../src/net/manaserv/charhandler.cpp:193
+#: src/keyboardconfig.cpp:81
 #, fuzzy
-msgid "Player deleted."
-msgstr "Karaktär borttagen."
+msgid "Outfits Window"
+msgstr "Statusfönster"
 
-#: ../src/commandhandler.cpp:574
-msgid "Player no longer ignored!"
+#: src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
 msgstr ""
 
-#: ../src/commandhandler.cpp:552
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "Grupp skapad."
-
-#: ../src/commandhandler.cpp:569
-msgid "Player wasn't ignored!"
+#: src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Spelare"
-
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Spelare slår monster"
-
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
-msgid "Please distribute %d points"
-msgstr "Var vänlig fördela %d poäng"
+msgid "Emote Shortcut %d"
+msgstr "Tangent för smiley %d"
 
-#: ../src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Var vänlig ta bort %d poäng"
+#: src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Växla chattfönster"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
-msgid "Please specify a name."
-msgstr ""
+#: src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Rulla upp chatt"
 
-#: ../src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Var vänlig skriv både adressen och porten till en server."
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Rulla ned chatt"
 
-#: ../src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Giftet tog inte..."
+#: src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "Föregående chattflik"
 
-#: ../src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Port:"
+#: src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Nästa chattflik"
 
-#: ../src/gui/serverdialog.cpp:452
-msgid "Preparing download"
-msgstr ""
+#: src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "Välj okej"
 
-#: ../src/gui/chat.cpp:307
-#, fuzzy, c-format
-msgid "Present: %s; %d players are present."
-msgstr "%d spelare är närvarande."
+#: src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Ignorera inmatning 1"
 
-#: ../src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Klicka okej för att återuppstå"
+#: src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Ignorera inmatning 2"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Klicka på knappen för att starta kalibreringen"
+#: src/keyboardconfig.cpp:183
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
 
-#: ../src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "Föregående chattflik"
+#: src/localplayer.cpp:985
+msgid "Unable to pick up item."
+msgstr "Kunde inte plocka upp."
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Pris: %s / Totalt: %s"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:994
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Du plockade upp %s [@@%d|%s@@]."
+msgstr[1] "Du plockade upp %s [@@%d|%s@@]."
 
-#: ../src/playerrelations.cpp:326
-msgid "Print '...'"
+#: src/main.cpp:42
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: ../src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Föreslå handel"
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Pulserande"
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr "Visa alla viskningar i egna flikar"
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Avsluta"
+#: src/main.cpp:47
+msgid "Options:"
+msgstr "Alternativ:"
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Regnbåge"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version     : Visa aktuell version"
 
-#: ../src/gui/socialwindow.cpp:556
+#: src/main.cpp:49
 #, fuzzy
-msgid "Received guild request, but one already exists."
-msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help        : Visa den här hjälpen"
 
-#: ../src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : Konfigurationsfil att använda"
 
-#: ../src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Loggar chattmeddelanden…"
+#: src/main.cpp:51
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username    : Logga in med det här användarnamnet"
 
-#: ../src/gui/setup_colors.cpp:108
+#: src/main.cpp:52
 #, fuzzy
-msgid "Red:"
-msgstr "Röd: "
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password    : Logga in med det här lösenordet"
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
-#: ../src/gui/register.cpp:73
-msgid "Register"
-msgstr "Registrera"
+#: src/main.cpp:53
+#, fuzzy
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character   : Logga in med den här karaktären"
 
-#: ../src/gui/login.cpp:129
+#: src/main.cpp:54
 #, fuzzy
-msgid "Registration disabled"
-msgstr "Upplocksdelning avaktiverad."
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server      : Namn eller IP-adress för inloggningsserver"
 
-#: ../src/net/tmwa/loginhandler.cpp:165
+#: src/main.cpp:55
 #, fuzzy
-msgid "Rejected from server."
-msgstr "Nekad tillträde till servern"
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port        : Port på inloggningsserver"
 
-#: ../src/gui/socialwindow.cpp:472
-#, fuzzy, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Avslog inbjudan från %s."
+#: src/main.cpp:56
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : Använd den här uppdateringsvärden"
 
-#: ../src/gui/socialwindow.cpp:453
-#, fuzzy, c-format
-msgid "Rejected party invite from %s."
-msgstr "Avslog inbjudan från %s."
+#: src/main.cpp:57
+#, fuzzy
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default     : Välj förvald karaktärsserver och karaktär"
 
-#: ../src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Relation"
+#: src/main.cpp:59
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Ladda inte ner uppdateringar"
 
-#: ../src/gui/login.cpp:60
+#: src/main.cpp:60
 #, fuzzy
-msgid "Remember username"
-msgstr "Kom ihåg användarnamnet"
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data        : Katalog att hämta speldata från"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Förfrågan om byteshandel"
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir    : Katalog att använda som hemkatalog"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: src/main.cpp:62
 #, fuzzy
-msgid "Request to quit denied!"
-msgstr "Förfrågan om byteshandel"
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Konfigurationsfil att använda"
 
-#: ../src/client.cpp:774
+#: src/main.cpp:63
 #, fuzzy
-msgid "Requesting characters"
-msgstr "Välj karaktär"
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir    : Katalog att använda som hemkatalog"
 
-#: ../src/client.cpp:858
-msgid "Requesting registration details"
-msgstr ""
+#: src/main.cpp:65
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl   : Använd inte OpenGL den här sessionen"
 
-#: ../src/commandhandler.cpp:436
-#, c-format
-msgid "Requesting to join channel %s."
-msgstr "Skickar förfrågan att gå in i chattkanalen %s."
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Du är död."
 
-#: ../src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Återställ"
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Vi beklagar att behöva meddela dig om att din karaktär dödades i strid."
 
-#: ../src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Återställ fönster"
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Du är inte så värst levande längre."
 
-#: ../src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr "Omstart krävs för att ändringarna ska synas."
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Liemannens svala händer sträcker sig efter din själ."
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "Starta om din klient för att ändringen ska börja gälla."
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Spelet är slut!"
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Hämta"
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Barn, barn. Din karaktär dog egentligen inte. Den… öh… kom till ett bättre "
+"ställe."
 
-#: ../src/commandhandler.cpp:489
-msgid "Return now toggles chat."
-msgstr "Retur växlar nu chattfönstrets synlighet."
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Din plan att ha sönder dina fiendens vapen genom att krossa dem med din hals "
+"misslyckades."
 
-#: ../src/commandhandler.cpp:480
-msgid "Return toggles chat."
-msgstr "Retur visar/döljer chattfönstret."
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Jag antar att det kunde gått bättre."
 
-#: ../src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Rotera spaken"
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Vill du att dina tillhörigheter ska identifieras?"
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Ledsamt nog så kunde inga spår efter dig någonsin hittas…"
 
-#: ../src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Kunde inte spara skärmbild!"
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Tillintetgjord."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Verkar som att som att någon gav dig ditt huvud."
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Du klantade till det igen, släng din kropp vid kloakerna och skaffa dig en "
+"ny."
+
+#: src/net/manaserv/beinghandler.cpp:323
 #, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Skärmupplösning ändrad"
+msgid "Press OK to respawn."
+msgstr " Klicka okej för att återuppstå"
 
-#: ../src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Skärmbild"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Du dog"
 
-#: ../src/game.cpp:333
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 #, fuzzy
-msgid "Screenshot saved as "
-msgstr "Skärmbild sparades till ~/"
+msgid "Not logged in."
+msgstr "Redan inloggad"
 
-#: ../src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Rulla ned chatt"
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Rulla upp chatt"
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Verkar som att du behöver mer pengar… ;-)"
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Användarnamnet finns redan"
 
-#: ../src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "Välj okej"
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
 
-#: ../src/gui/worldselectdialog.cpp:71
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
-msgid "Select World"
-msgstr "Välj okej"
+msgid "Character's stats are too high."
+msgstr "Karaktärens värden okej"
 
-#: ../src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Välj antal föremål att släppa."
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Karaktärens värden okej"
 
-#: ../src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
-msgstr "Välj antal att hämta."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: ../src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Välj antal föremål att dela."
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Okänt fel"
 
-#: ../src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Välj antal att lagra."
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Information"
 
-#: ../src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Välj antal föremål att handla med."
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Karaktär borttagen."
 
-#: ../src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Välj antal föremål att handla med."
 
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Sälj"
-
-#: ../src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Skicka"
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Okänt fel"
 
-#: ../src/gui/serverdialog.cpp:211
-#, fuzzy
-msgid "Server type:"
-msgstr "Server:"
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Ingen spelserver finns tillgänglig."
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Server:"
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Ämne: %s"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Inställningar"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Spelare slår monster"
 
-#: ../src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Inställningsfönster"
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Kommando: /join <chattkanal>"
 
-#: ../src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Volym för ljudeffekter"
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Skickar förfrågan att gå in i chattkanalen %s."
 
-#: ../src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Affär"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#: ../src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Genvägar"
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s anslöt sig till gruppen."
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
-msgid "Show IP: Off"
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
 msgstr ""
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
-msgid "Show IP: On"
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254
-#, fuzzy
-msgid "Show damage"
-msgstr "Visa namn"
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#: ../src/gui/setup_players.cpp:232
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
-msgid "Show gender"
-msgstr "Visa namn"
+msgid "Unknown channel event."
+msgstr "Okänt kommando."
 
-#: ../src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show own name"
-msgstr "Visa namn"
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Gille skapat."
 
-#: ../src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
-msgstr "Visa erhållna saker"
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Kunde inte skapa gille."
 
-#: ../src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "Sitt"
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Inbjudan skickad."
 
-#: ../src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Kan inte sitta!"
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Medlem befordrad."
 
-#: ../src/gui/skilldialog.cpp:362
-#, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Färdigheter"
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Kunde inte befordra medlem."
 
-#: ../src/gui/skilldialog.cpp:353
-#, fuzzy, c-format
-msgid "Skill Set %d"
-msgstr "Färdighetspoäng: %d"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Fel magic_token"
 
-#: ../src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Färdighetsfönster"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Redan inloggad"
 
-#: ../src/gui/skilldialog.cpp:271
-#, fuzzy, c-format
-msgid "Skill points available: %d"
-msgstr "Färdighetspoäng: %d"
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Konto raderat"
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Färdigheter"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Det nya lösenordet stämmer inte överens"
 
-#: ../src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr "Utrymme:"
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Det gamla lösenordet är fel"
 
-#: ../src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Liten"
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Kontot är inte anslutet. Var god logga in först."
 
-#: ../src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Smiley"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Den nya epostadressen är felaktig."
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
-msgid "Social"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Den gamla epostadressen är fel."
 
-#: ../src/keyboardconfig.cpp:80
+#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "Social Window"
-msgstr "Färdighetsfönster"
+msgid "The new email address already exists."
+msgstr "Den nya epostadressen används redan."
 
-#: ../src/gui/setup_video.cpp:582
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: ../src/net/tmwa/generalhandler.cpp:136
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Någon annan försöker att använda det här kontot"
-
-#: ../src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Ljud"
-
-#: ../src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr ""
+msgid "Client version is too old."
+msgstr "Du har en för gammal version av klienten"
 
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Felaktigt användarnamn eller lösenord"
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Konto raderat"
 
-#: ../src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Spektrum"
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Felaktigt användarnamn, lösenord eller epostadress"
 
-#: ../src/net/tmwa/generalhandler.cpp:142
+#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Speed hack detected."
-msgstr "Ett hastighetshack har upptäckts"
+msgid "Username already exists."
+msgstr "Användarnamnet finns redan"
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
-msgid "Split"
-msgstr "Dela"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Epostadressen finns redan"
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: ../src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Börjar logga chattmeddelanden…"
-
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Statisk"
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Anslöt dig till grupp."
 
-#: ../src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Status"
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s anslöt sig till gruppen."
 
-#: ../src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Statusfönster"
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s avvisade din inbjudan."
 
-#: ../src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Stopp"
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Accepterar byteshandelsförfrågningar."
 
-#: ../src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Sluta attackera"
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorerar byteshandelsförfrågningar."
 
-#: ../src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Sluta logga chattmeddelanden"
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Förfrågan om byteshandel"
 
-#: ../src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Lagring"
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s vill byteshandla med dig, accepterar du?"
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
-msgid "Store"
-msgstr "Lagra"
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Byteshandlar med %s"
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Styrka"
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Byteshandel avbruten."
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Styrka %+d"
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Byteshandel genomförd."
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Styrka:"
+#: src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Kunde inte sparka ut!"
 
-#: ../src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Vidare"
+#: src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Klarade av att sparka ut!"
 
-#: ../src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr ""
+#: src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Inget att sälja."
 
-#: ../src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Byt karaktär"
+#: src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Tack för köpet."
 
-#: ../src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Byt server"
+#: src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Kan inte köpa."
 
-#: ../src/gui/setup_video.cpp:445
-#, fuzzy
-msgid "Switching to Full Screen"
-msgstr "Byte till helskärm"
+#: src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Tack för en god affär."
 
-#: ../src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Prata"
+#: src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Kan inte sälja."
 
-#: ../src/gui/popupmenu.cpp:150
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@talk|Prata med %s@@"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: ../src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Välj & attackera"
+#: src/net/tmwa/charserverhandler.cpp:107
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Kan inte använda ID"
 
-#: ../src/keyboardconfig.cpp:49
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Target Monster"
-msgstr "Välj närmaste"
+msgid "Unknown char-server failure."
+msgstr "Okänt fel"
 
-#: ../src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "Välj NPC"
+#: src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Kan inte skapa karaktär. Troligtvis används namnet av någon annan."
 
-#: ../src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Välj spelare"
+#: src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Karaktär borttagen."
 
-#: ../src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Text"
+#: src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Kunde inte ta bort karaktär."
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Tack för köpet."
+#: src/net/tmwa/charserverhandler.cpp:266
+msgid "Strength:"
+msgstr "Styrka:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Tack för en god affär."
+#: src/net/tmwa/charserverhandler.cpp:267
+msgid "Agility:"
+msgstr "Smidighet:"
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Liemannens svala händer sträcker sig efter din själ."
+#: src/net/tmwa/charserverhandler.cpp:268
+msgid "Vitality:"
+msgstr "Hälsa:"
 
-#: ../src/game.cpp:368
-#, fuzzy
-msgid "The connection to the server was lost."
-msgstr ""
-"Förbindelsen till servern förlorades, programmet kommer nu att avslutas."
+#: src/net/tmwa/charserverhandler.cpp:269
+msgid "Intelligence:"
+msgstr "Intelligens:"
 
-#: ../src/gui/changeemaildialog.cpp:141
-#, fuzzy
-msgid "The email address entries mismatch."
-msgstr "Den nya epostadressen används redan."
+#: src/net/tmwa/charserverhandler.cpp:270
+msgid "Dexterity:"
+msgstr "Skicklighet:"
 
-#: ../src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "Den nya epostadressen används redan."
+#: src/net/tmwa/charserverhandler.cpp:271
+msgid "Luck:"
+msgstr "Tur:"
 
-#: ../src/gui/changeemaildialog.cpp:127
+#: src/net/tmwa/chathandler.cpp:87
 #, fuzzy, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "Användarnamnet måste vara minst %d tecken långt."
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Kunde inte viska eftersom spelaren inte är inloggad."
 
-#: ../src/gui/changeemaildialog.cpp:134
+#: src/net/tmwa/chathandler.cpp:96
 #, fuzzy, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "Användarnamnet måste vara kortare än %d tecken."
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: ../src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
+#: src/net/tmwa/chathandler.cpp:230
+#, fuzzy
+msgid "MVP player."
+msgstr "Spelare"
+
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Chattkanaler stöds inte!"
+
+#: src/net/tmwa/gamehandler.cpp:88
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: ../src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "Lösenordet måste vara minst %d tecken långt."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Game"
+msgstr "Namn"
 
-#: ../src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "Lösenordet måste vara kortare än %d tecken."
+#: src/net/tmwa/gamehandler.cpp:101
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Förfrågan om byteshandel"
 
-#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "Lösenordet måste vara minst %d tecken långt."
+msgid "Strength %+d"
+msgstr "Styrka %+d"
 
-#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "Lösenordet måste vara kortare än %d tecken."
+msgid "Agility %+d"
+msgstr "Smidighet %+d"
 
-#: ../src/gui/register.cpp:166
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "Användarnamnet måste vara minst %d tecken långt."
+msgid "Vitality %+d"
+msgstr "Livskraft %+d"
 
-#: ../src/gui/register.cpp:174
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "Användarnamnet måste vara kortare än %d tecken."
+msgid "Intelligence %+d"
+msgstr "Intelligens %+d"
+
+#: src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Skicklighet %+d"
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
+msgstr "Tur %+d"
+
+#: src/net/tmwa/generalhandler.cpp:132
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Behörighetskontroll misslyckades"
+
+#: src/net/tmwa/generalhandler.cpp:135
+#, fuzzy
+msgid "No servers available."
+msgstr "Ingen server är tillgänglig"
+
+#: src/net/tmwa/generalhandler.cpp:139
+#, fuzzy
+msgid "Someone else is trying to use this account."
+msgstr "Någon annan försöker att använda det här kontot"
 
-#: ../src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Det här kontot är redan inloggat"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:81
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Det här kommandot får spelaren att lämna gruppen."
+msgid "Speed hack detected."
+msgstr "Ett hastighetshack har upptäckts"
 
-#: ../src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Det här kommandot får spelaren att lämna gruppen."
+#: src/net/tmwa/generalhandler.cpp:148
+#, fuzzy
+msgid "Duplicated login."
+msgstr "Dubbel inloggning"
 
-#: ../src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "Det här kommandot ändrar hur erfarenhet fördelas inom gruppen."
+#: src/net/tmwa/generalhandler.cpp:151
+#, fuzzy
+msgid "Unknown connection error."
+msgstr "Okänt anslutningsfel"
 
-#: ../src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr ""
-"Det här kommandot ändrar huruvida gruppen ska kunna plocka upp efter alla."
+#: src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Kopplades från servern!"
 
-#: ../src/commandhandler.cpp:275
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Det här kommandot sätter ämnet till <meddelande>."
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Styrka"
 
-#: ../src/commandhandler.cpp:229
-msgid "This command clears the chat log of previous chat."
-msgstr "Det här kommandot tömmer chattloggen."
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Smidighet"
 
-#: ../src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "Det här kommandot stänger aktuell viskningsflik."
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Hälsa"
 
-#: ../src/commandhandler.cpp:280
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Dessa kommandon skapar <grupp>."
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Intelligens"
 
-#: ../src/commandhandler.cpp:210
-msgid "This command displays a list of all commands available."
-msgstr "Det här kommandot visar en lista över alla tillgängliga kommandon."
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Skicklighet"
 
-#: ../src/commandhandler.cpp:213
-msgid "This command displays help on <command>."
-msgstr "Det här kommandot ger mer information om <kommando>."
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Tur"
 
-#: ../src/commandhandler.cpp:324
-msgid "This command displays the name of the current map."
-msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
+#: src/net/tmwa/generalhandler.cpp:238
+#, fuzzy
+msgid "Defense"
+msgstr "Försvar:"
 
-#: ../src/commandhandler.cpp:329
-msgid "This command displays the number of players currently online."
-msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
+#: src/net/tmwa/generalhandler.cpp:239
+#, fuzzy
+msgid "M.Attack"
+msgstr "M. attack:"
 
-#: ../src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr "Det här kommandot visar om erfarenhet delas inom gruppen."
+#: src/net/tmwa/generalhandler.cpp:240
+#, fuzzy
+msgid "M.Defense"
+msgstr "M. försvar:"
 
-#: ../src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr "Det här kommandot visar huruvida gruppen kan plocka upp efter alla."
+#: src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Träffsäkerhet:"
 
-#: ../src/commandhandler.cpp:313
-msgid "This command displays the return toggle status."
-msgstr "Det här kommandot visar tillståndet för huruvida retur används."
+#: src/net/tmwa/generalhandler.cpp:242
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% Kringgå:"
 
-#: ../src/commandhandler.cpp:302
-msgid "This command finishes a recording session."
-msgstr "Det här kommandot slutar loggning av chatten."
+#: src/net/tmwa/generalhandler.cpp:243
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "Kritisk träff"
 
-#: ../src/commandhandler.cpp:292
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"Det här kommandot ger en lista över spelare som finns inom höravstånd, om "
-"loggning av chatten är aktiverad skickas listan till loggfilen."
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gille"
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Visa den här hjälpen"
 
-#: ../src/commandhandler.cpp:234
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Bjud in en spelare till din grupp"
 
-#: ../src/gui/widgets/whispertab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Lämna gruppen du är i"
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Det här kommandot bjuder in <spelare> till din grupp."
+#: src/net/tmwa/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Sparka ut någon från din grupp"
+
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Kommando: /invite <spelare>"
 
-#: ../src/net/tmwa/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Det här kommandot bjuder in <spelare> till din grupp."
 
-#: ../src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Det här kommandot gör att du lämnar aktuell chattkanal."
-
-#: ../src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Det här kommandot gör <spelare> till chattkanalsoperatör."
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Kommando: /leave"
 
-#: ../src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Det här kommandot sparkar ut <spelare> ur chattkanalen."
+#: src/net/tmwa/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Det här kommandot får spelaren att lämna gruppen."
 
-#: ../src/commandhandler.cpp:240
-msgid "This command makes you enter <channel>."
-msgstr "Det här kommandot låter dig gå in i <chattkanal>."
+#: src/net/tmwa/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Du måste ange gruppens namn."
 
-#: ../src/commandhandler.cpp:223
-msgid "This command sends the message <msg> to all players currently online."
+#: src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
 msgstr ""
-"Det här kommandot skickar meddelandet <text> till alla inloggade spelare."
-
-#: ../src/commandhandler.cpp:258
-msgid "This command sends the text <message> to <nick>."
-msgstr "Det här kommandot skickar <meddelande> till <spelare>."
-
-#: ../src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Det här kommandot sätter ämnet till <meddelande>."
 
-#: ../src/commandhandler.cpp:307
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
 msgstr ""
-"Det här kommandot anger huruvida retur visar/döljerer chattfönstret eller om "
-"chattfönstret stänger sig själv."
 
-#: ../src/commandhandler.cpp:246
-msgid "This command shows a list of all channels."
-msgstr "Det här kommandot visar en lista över alla chattkanaler."
-
-#: ../src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Det här kommandot visar alla spelare i den här chattkanalen."
-
-#: ../src/commandhandler.cpp:299
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "Det här kommandot startar loggning av chatten till <filnamn>."
+#: src/net/tmwa/guildhandler.cpp:306
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s är nu en medlem i din grupp."
 
-#: ../src/commandhandler.cpp:318
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
 msgstr ""
 
-#: ../src/gui/widgets/whispertab.cpp:95
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Det här kommandot startar loggning av chatten till <filnamn>."
-
-#: ../src/commandhandler.cpp:251
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Det här kommandet berättar för andra att du är/gör <meddelande>."
-
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
+msgid "Unknown guild invite response."
+msgstr "Okänt injudningssvar från %s."
 
-#: ../src/commandhandler.cpp:266
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
 msgstr ""
-"Det här kommandot försöker att skapa en flik för viskningar mellan dig och "
-"<spelare>."
 
-#: ../src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "Så här ser färgen ut"
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Grupp"
 
-#: ../src/net/tmwa/loginhandler.cpp:179
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "Det här användarnamnet finns redan"
+#: src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Bjud in en spelare till din grupp"
 
-#: ../src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Pytteliten"
+#: src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Lämna gruppen du är i"
 
-#: ../src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "Till:"
+#: src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Sparka ut någon från din grupp"
 
-#: ../src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr "Växla chattfönster"
+#: src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Visa/ändra delningsalternativ för upplock inom gruppen"
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Ämne: %s"
+#: src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Visa/ändra hur erfarenhet fördelas i gruppen"
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Byteshandla"
+#: src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Det här kommandot får spelaren att lämna gruppen."
 
-#: ../src/net/manaserv/tradehandler.cpp:149
-#: ../src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Byteshandel avbruten."
+#: src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Kommando: /item <alternativ>"
 
-#: ../src/net/tmwa/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Byteshandel avbröts av okänd anledning."
+#: src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+"Det här kommandot ändrar huruvida gruppen ska kunna plocka upp efter alla."
 
-#: ../src/net/manaserv/tradehandler.cpp:156
-#: ../src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Byteshandel genomförd."
+#: src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<alternativ> kan vara antingen �1�, �yes� eller �true� för att dela på "
+"upplocken inom gruppen (vem som helst inom gruppen kan direkt plocka upp "
+"efter alla gruppmedlemmar), eller �0�, �no� eller �false� för att inte dela "
+"på upplocken."
 
-#: ../src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Byteshandel misslyckades!"
+#: src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Kommando: /item"
 
-#: ../src/net/tmwa/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Byteshandel med %s avbruten."
+#: src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr "Det här kommandot visar huruvida gruppen kan plocka upp efter alla."
 
-#: ../src/gui/popupmenu.cpp:83
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "Byteshandlar med %s"
+#: src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Kommando: /exp <alternativ>"
 
-#: ../src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Byteshandel: du"
+#: src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr "Det här kommandot ändrar hur erfarenhet fördelas inom gruppen."
 
-#: ../src/net/tmwa/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Byteshandel: du och %s"
+#: src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<alternativ> kan vara antingen �1�, �yes� eller �true� för att tillåta "
+"delning av erfarenhet, eller �0�, �no� eller �false� för att inte dela på "
+"erfarenhet."
 
-#: ../src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Byteshandel är inte möjligt. Karaktären existerar inte."
+#: src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Kommando: /exp"
 
-#: ../src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Byteshandel är inte möjligt. Handelspartnern är för långt borta."
+#: src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Det här kommandot visar om erfarenhet delas inom gruppen."
 
-#: ../src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Byteshandlar med %s"
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Upplocksdelning aktiverad."
 
-#: ../src/gui/setup_video.cpp:477
-#, fuzzy
-msgid "Transparency disabled"
-msgstr "Fördelning av erfarenhet inaktiverad."
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Upplocksdelning avaktiverad."
 
-#: ../src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
-msgstr ""
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "Upplocksdelning är inte möjligt."
 
-#: ../src/localplayer.cpp:1251
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
-msgid "Tried to pick up nonexistent item."
-msgstr "Kunde inte plocka upp."
+msgid "Item sharing unknown."
+msgstr "Upplocksdelning aktiverad."
 
-#: ../src/commandhandler.cpp:335
-msgid "Type /help for a list of commands."
-msgstr "Skriv /help för en lista med kommandon."
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Fördelning av erfarenhet aktiverad."
 
-#: ../src/gui/changeemaildialog.cpp:51
-#, fuzzy
-msgid "Type new email address twice:"
-msgstr "Ange den nya epostadressen två gånger:"
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr "Fördelning av erfarenhet inaktiverad."
 
-#: ../src/gui/changepassworddialog.cpp:63
-#, fuzzy
-msgid "Type new password twice:"
-msgstr "Ange det nya lösenordet två gånger:"
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "Fördelning av erfarenhet ej möjlig."
 
-#: ../src/gui/setup_colors.cpp:71
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
-msgid "Type:"
-msgstr "Typ: "
+msgid "Experience sharing unknown."
+msgstr "Fördelning av erfarenhet aktiverad."
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Kan inte köpa."
+#: src/net/tmwa/inventoryhandler.cpp:285
+msgid "Failed to use item."
+msgstr "Kunde inte använda föremål."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Kan inte utrusta."
 
-#: ../src/net/tmwa/network.cpp:345
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Kan inte sälja."
-
-#: ../src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Kan inte sälja."
-
-#: ../src/net/tmwa/inventoryhandler.cpp:418
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Kan inte avrusta."
 
-#: ../src/gui/setup_keyboard.cpp:90
-#, fuzzy
-msgid "Unassign"
-msgstr "Tilldela"
-
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
-msgid "Unequip"
-msgstr "Avrusta"
-
-#: ../src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "Avrusta"
-
-#: ../src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "Ett okänt paket för att avbryta byteshandeln påträffades."
-
-#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr ""
+#: src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Kontot kunde inte hittas. Var vänlig att logga in på nytt."
 
-#: ../src/net/net.cpp:145
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Okänt föremålsslag"
+msgid "New password too short."
+msgstr "Det nya lösenordet är för kort"
 
-#: ../src/net/manaserv/chathandler.cpp:327
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
-msgid "Unknown channel event."
-msgstr "Okänt kommando."
+msgid "Unregistered ID."
+msgstr "Oregistrerat ID"
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Okänt fel"
-
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
-msgid "Unknown command."
-msgstr "Okänt kommando."
+msgid "Wrong password."
+msgstr "Fel lösenord"
 
-#: ../src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
-msgid "Unknown connection error."
-msgstr "Okänt anslutningsfel"
-
-#: ../src/net/manaserv/charhandler.cpp:208
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Okänt fel"
+msgid "Account expired."
+msgstr "Konto raderat"
 
-#: ../src/net/manaserv/charhandler.cpp:164
-#: ../src/net/manaserv/loginhandler.cpp:96
-#: ../src/net/manaserv/loginhandler.cpp:127
-#: ../src/net/manaserv/loginhandler.cpp:161
-#: ../src/net/manaserv/loginhandler.cpp:279
-#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
-msgid "Unknown error."
-msgstr "Okänt fel"
+msgid "Rejected from server."
+msgstr "Nekad tillträde till servern"
 
-#: ../src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
-msgid "Unknown guild invite response."
-msgstr "Okänt injudningssvar från %s."
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr "Du har permanent blivit bannlyst från spelet. Kontakta en GM."
 
-#: ../src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
-msgid "Unknown invite response for %s."
-msgstr "Okänt injudningssvar från %s."
-
-#: ../src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Okänt föremål"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Du har tillfälligt blivit utkastat från spelet till %s.\n"
+"Var vänlig kontakta en GM i forumet."
 
-#: ../src/localplayer.cpp:1258
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
-msgid "Unknown problem picking up item."
-msgstr "Kunde inte plocka upp."
-
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
-#: ../src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Avregistrera"
+msgid "This user name is already taken."
+msgstr "Det här användarnamnet finns redan"
 
-#: ../src/client.cpp:926
-#, fuzzy
-msgid "Unregister Successful"
-msgstr "Avregistrera"
+#: src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#: ../src/net/tmwa/loginhandler.cpp:156
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
-msgid "Unregistered ID."
-msgstr "Oregistrerat ID"
-
-#: ../src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Upp"
-
-#: ../src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Uppdaterar..."
-
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
-msgid "Use"
-msgstr "Använd"
+msgid "Unable to resolve host \""
+msgstr "Kan inte sälja."
 
-#: ../src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
-msgid "User is now part of your guild."
-msgstr "%s är nu en medlem i din grupp."
-
-#: ../src/net/tmwa/guildhandler.cpp:300
-msgid "User rejected guild invite."
-msgstr ""
+msgid "Connection to server terminated. "
+msgstr "Ansluter till kartservern..."
 
-#: ../src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Användarnamnet finns redan"
+#: src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Kunde inte skapa grupp."
 
-#: ../src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Video"
+#: src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Grupp skapad."
 
-#: ../src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Synliga namn"
+#: src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s är redan medlem i en grupp."
 
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Hälsa"
+#: src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s avvisade din inbjudan."
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
-msgid "Vitality %+d"
-msgstr "Livskraft %+d"
+msgid "%s is now a member of your party."
+msgstr "%s är nu en medlem i din grupp."
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Hälsa:"
+#: src/net/tmwa/partyhandler.cpp:131
+#, c-format
+msgid "Unknown invite response for %s."
+msgstr "Okänt injudningssvar från %s."
 
-#: ../src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "Väntar på server"
+#: src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Du har lämnat gruppen."
 
-#: ../src/gui/serverdialog.cpp:448
-#, fuzzy
-msgid "Waiting for server..."
-msgstr "Väntar på server"
+#: src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s har lämnat din grupp."
 
-#: ../src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "Kartförflyttning misslyckades..."
+#: src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "En okänd medlem försökte säga: %s"
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
-"Vi beklagar att behöva meddela dig om att din karaktär dödades i strid."
 
-#: ../src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Vikt:"
+#: src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s är inte med i din grupp!"
 
-#: ../src/gui/itempopup.cpp:126
-#, fuzzy, c-format
-msgid "Weight: %s"
-msgstr "Vikt: "
+#: src/net/tmwa/playerhandler.cpp:100
+msgid "Insert coin to continue."
+msgstr "Stoppa i mynt för att fortsätta."
 
-#: ../src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "Vid ignorering:"
+#: src/net/tmwa/playerhandler.cpp:118
+msgid "You're not dead yet. You're just resting."
+msgstr "Du är inte död än. Du vilar bara."
 
-#: ../src/gui/popupmenu.cpp:91
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "Viskning"
+#: src/net/tmwa/playerhandler.cpp:119
+msgid "You are no more."
+msgstr "Du finns inte längre."
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Kunde inte viska eftersom ignorerad av spelaren."
+#: src/net/tmwa/playerhandler.cpp:120
+msgid "You have ceased to be."
+msgstr "Du har slutat att existera."
 
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "Kunde inte viska eftersom spelaren inte är inloggad."
+#: src/net/tmwa/playerhandler.cpp:121
+msgid "You've expired and gone to meet your maker."
+msgstr "Du är passé och har givit dig av för att träffa din skapare."
 
-#: ../src/gui/chat.cpp:452
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Viskar till %s: %s"
+#: src/net/tmwa/playerhandler.cpp:122
+msgid "You're a stiff."
+msgstr "Du är en steling."
 
-#: ../src/gui/socialwindow.cpp:158
-#, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr ""
+#: src/net/tmwa/playerhandler.cpp:123
+msgid "Bereft of life, you rest in peace."
+msgstr "Berövad på ditt liv vilar du numera i frid."
 
-#: ../src/gui/socialwindow.cpp:237
-#, c-format
-msgid "Who would you like to invite to party %s?"
+#: src/net/tmwa/playerhandler.cpp:124
+msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
+"Om du inte vore så livfull skulle du vara blomnäring vid det här laget."
 
-#: ../src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Viljestyrka:"
-
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "Viljekraft %+d"
-
-#: ../src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Fel magic_token"
-
-#: ../src/net/tmwa/loginhandler.cpp:159
-#, fuzzy
-msgid "Wrong password."
-msgstr "Fel lösenord"
-
-#: ../src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Felaktigt användarnamn eller lösenord"
+#: src/net/tmwa/playerhandler.cpp:125
+msgid "Your metabolic processes are now history."
+msgstr "Dina metaboliska processer är nu historia."
 
-#: ../src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Felaktigt användarnamn, lösenord eller epostadress"
+#: src/net/tmwa/playerhandler.cpp:126
+msgid "You're off the twig."
+msgstr "Du har trillat av pinn."
 
-#: ../src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Ja"
+#: src/net/tmwa/playerhandler.cpp:127
+msgid "You've kicked the bucket."
+msgstr "Du har kastat in handduken."
 
-#: ../src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Du dog"
+#: src/net/tmwa/playerhandler.cpp:128
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr "Du tog ner skylten, kilade runt hörnet och bet i gräset."
 
-#: ../src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Du är en före detta spelare."
 
-#: ../src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:131
+msgid "You're pining for the fjords."
+msgstr "Du har gått till de sälla jaktmarkerna."
+
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
+msgid "Message"
+msgstr "Meddelande"
+
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Du bär mer än halva din vikt på dig. Du kan inte återfå hälsa."
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Du är död."
-
-#: ../src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Du finns inte längre."
-
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Du är inte så värst levande längre."
+#: src/net/tmwa/playerhandler.cpp:313
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Du plockade upp "
 
-#: ../src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
+#: src/net/tmwa/playerhandler.cpp:348
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: ../src/net/tmwa/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "Du kan inte göra det just nu!"
-
-#: ../src/net/tmwa/specialhandler.cpp:189
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Det går inte att använda den här förmågan med det där vapenslaget!"
+#: src/net/tmwa/playerhandler.cpp:488
+msgid "Equip arrows first."
+msgstr "Utrusta dig med pilar först."
 
-#: ../src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "Du har inte tillräckligt med pengar."
+#: src/net/tmwa/specialhandler.cpp:144
+msgid "Trade failed!"
+msgstr "Byteshandel misslyckades!"
 
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
-#, fuzzy, c-format
-msgid "You get %s"
-msgstr "Du får %s."
+#: src/net/tmwa/specialhandler.cpp:147
+msgid "Emote failed!"
+msgstr "Kan inte visa smiley!"
 
-#: ../src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "Du ger:"
+#: src/net/tmwa/specialhandler.cpp:150
+msgid "Sit failed!"
+msgstr "Kan inte sitta!"
 
-#: ../src/gui/socialwindow.cpp:592
-#, fuzzy, c-format
-msgid "You have been invited to join the %s party."
-msgstr "%s har bjudit in dig till %ss grupp."
+#: src/net/tmwa/specialhandler.cpp:153
+msgid "Chat creating failed!"
+msgstr "Kan inte skicka chattmeddelande!"
 
-#: ../src/gui/socialwindow.cpp:588
-#, fuzzy
-msgid "You have been invited you to join a party."
-msgstr "%s har bjudit in dig till sin grupp."
+#: src/net/tmwa/specialhandler.cpp:156
+msgid "Could not join party!"
+msgstr "Kan inte ansluta till gruppen!"
 
-#: ../src/net/tmwa/loginhandler.cpp:168
-#, fuzzy
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr "Du har permanent blivit bannlyst från spelet. Kontakta en GM."
+#: src/net/tmwa/specialhandler.cpp:159
+msgid "Cannot shout!"
+msgstr "Kan inte skrika!"
 
-#: ../src/net/tmwa/loginhandler.cpp:172
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
-msgstr ""
-"Du har tillfälligt blivit utkastat från spelet till %s.\n"
-"Var vänlig kontakta en GM i forumet."
+#: src/net/tmwa/specialhandler.cpp:168
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Du har inte nått en tillräckligt hög nivå än!"
 
-#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Du har slutat att existera."
+#: src/net/tmwa/specialhandler.cpp:171
+msgid "Insufficient HP!"
+msgstr "Otillräckligt med HP!"
 
-#: ../src/net/tmwa/partyhandler.cpp:241
-msgid "You have left the party."
-msgstr "Du har lämnat gruppen."
+#: src/net/tmwa/specialhandler.cpp:174
+msgid "Insufficient SP!"
+msgstr "Otillräckligt med SP!"
 
-#: ../src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Du har inga anteckningar!"
 
-#: ../src/net/tmwa/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Du har inte nått en tillräckligt hög nivå än!"
+#: src/net/tmwa/specialhandler.cpp:180
+msgid "You cannot do that right now!"
+msgstr "Du kan inte göra det just nu!"
 
-#: ../src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:183
+msgid "Seems you need more money... ;-)"
+msgstr "Verkar som att du behöver mer pengar… ;-)"
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:186
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Det går inte att använda den här förmågan med det där vapenslaget!"
 
-#: ../src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:189
+msgid "You need another red gem!"
+msgstr "Du behöver en till röd juvel!"
+
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå juvel!"
 
-#: ../src/net/tmwa/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "Du behöver en till röd juvel!"
+#: src/net/tmwa/specialhandler.cpp:195
+msgid "You're carrying to much to do this!"
+msgstr "Du bär på för mycket för att kunna göra det här!"
 
-#: ../src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
-msgstr ""
+#: src/net/tmwa/specialhandler.cpp:198
+msgid "Huh? What's that?"
+msgstr "Öh? Vad är det där?"
 
-#: ../src/localplayer.cpp:1276
-#, fuzzy, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Du plockade upp %s [@@%d|%s@@]."
-msgstr[1] "Du plockade upp %s [@@%d|%s@@]."
+#: src/net/tmwa/specialhandler.cpp:207
+msgid "Warp failed..."
+msgstr "Kartförflyttning misslyckades..."
 
-#: ../src/net/tmwa/playerhandler.cpp:344
-#, fuzzy, c-format
-msgid "You picked up %s."
-msgstr "Du plockade upp "
+#: src/net/tmwa/specialhandler.cpp:210
+msgid "Could not steal anything..."
+msgstr "Kunde inte stjäla något..."
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Du klantade till det igen, släng din kropp vid kloakerna och skaffa dig en "
-"ny."
+#: src/net/tmwa/specialhandler.cpp:213
+msgid "Poison had no effect..."
+msgstr "Giftet tog inte..."
 
-#: ../src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Byteshandel är inte möjligt. Handelspartnern är för långt borta."
 
-#: ../src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "Du är en steling."
+#: src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Byteshandel är inte möjligt. Karaktären existerar inte."
 
-#: ../src/net/tmwa/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "Du bär på för mycket för att kunna göra det här!"
+#: src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Byteshandel avbröts av okänd anledning."
 
-#: ../src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "Du är inte död än. Du vilar bara."
+#: src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Byteshandel: du och %s"
 
-#: ../src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
-msgstr "Du har trillat av pinn."
+#: src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Byteshandel med %s avbruten."
 
-#: ../src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr "Du har gått till de sälla jaktmarkerna."
+#: src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr "Ett okänt paket för att avbryta byteshandeln påträffades."
 
-#: ../src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "Du är passé och har givit dig av för att träffa din skapare."
+#: src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Kunde inte lägga till föremål. Bytespartnern är överfull."
 
-#: ../src/net/tmwa/playerhandler.cpp:136
-msgid "You've kicked the bucket."
-msgstr "Du har kastat in handduken."
+#: src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Kunde inte lägga till föremål. Bytespartnern har inget ledigt utrymme."
 
-#: ../src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr "Du tog ner skylten, kilade runt hörnet och bet i gräset."
+#: src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Kunde inte lägga till föremål av okänd anledning."
 
-#: ../src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
+#: src/playerrelations.cpp:310
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|Ignorera %s fullständigt@@"
+
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: ../src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "Dina metaboliska processer är nu historia."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
+msgstr ""
 
-#: ../src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Ditt namn måste vara minst 4 tecken långt."
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "Attack %+d"
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Din plan att ha sönder dina fiendens vapen genom att krossa dem med din hals "
-"misslyckades."
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "Försvar %+d"
 
-#: ../src/gui/setup_video.cpp:233
-msgid "as particle"
-msgstr "som partikel"
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "Hälsa %+d"
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "hög"
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
+msgstr "Mana %+d"
 
-#: ../src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "i chattfönster"
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Okänt föremål"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "låg"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "namnlös"
 
-#: ../src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr ""
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: ../src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "maximal"
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: ../src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "medium"
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "EP:"
 
-#: ../src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "av"
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Pengar: %d"
 
-#: ../src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr ""
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Jobb:"
 
-#: ../src/gui/serverdialog.cpp:558
-#, c-format
-msgid "requires v%s"
-msgstr ""
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Nivå: %d"
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
-msgid "unnamed"
-msgstr "namnlös"
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "Tillträde nekat"
 
-#~ msgid ""
-#~ "\n"
-#~ "> Cancel\n"
-#~ msgstr ""
-#~ "\n"
-#~ "> Avbryt\n"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Kunde inte välja karaktär av okänd anledning"
 
-#~ msgid "  -D --default    : Bypass the login process with default settings"
+#~ msgid "Inviting like this isn't supported at the moment."
 #~ msgstr ""
-#~ "  -D --default    : Kringgå inloggningsprocessen och använd "
-#~ "grundinställningarna"
+#~ "För tillfället är det inte möjligt att bjuda in något på det här viset."
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " kan inte skapas och existerar inte! Avslutar."
+#~ msgid "Willpower:"
+#~ msgstr "Viljestyrka:"
 
-#~ msgid " cancelled"
-#~ msgstr " avbruten"
+#~ msgid "Willpower %+d"
+#~ msgstr "Viljekraft %+d"
 
-#~ msgid " host: "
-#~ msgstr " värd: "
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Viljestyrka:"
 
-#~ msgid " video mode: "
-#~ msgstr " -videoläge: "
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "Servern är full"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Reflexer:"
+#~ msgid "Text Shadow"
+#~ msgstr "Textskugga"
 
-#~ msgid "%s: %s"
-#~ msgstr "%s: %s"
+#~ msgid "Text Outline"
+#~ msgstr "Textkontur"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Alias för /create"
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Förloppsindikatoretiketter"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "Halv hälsostapel"
+#~ msgid "Background"
+#~ msgstr "Bakgrund"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "Kvarts hälsostapel"
+#~ msgid "Highlight"
+#~ msgstr "Markering"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Tvåhandsvapen"
+#~ msgid "Tab Highlight"
+#~ msgstr "Flikmarkering"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "Trekvarts hälsostapel"
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Den är för dyr"
 
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Sparka spelare@@"
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Du har utrustat dig"
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Attackera %s@@"
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Avbryt@@"
+#~ msgid "Player"
+#~ msgstr "Spelare"
 
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|Strunta i %s@@"
+#~ msgid "Whisper"
+#~ msgstr "Viskning"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Släpp@@"
+#~ msgid "Is"
+#~ msgstr "Är"
 
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|Ignorera %s@@"
+#~ msgid "Server"
+#~ msgstr "Server"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Plocka upp %s@@"
+#~ msgid "Logger"
+#~ msgstr "Loggning"
 
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|Plocka upp %s@@"
+#~ msgid "Hyperlink"
+#~ msgstr "Länk"
 
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|Hämta@@"
+#~ msgid "Being"
+#~ msgstr "Varelse"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Dela@@"
+#~ msgid "Other Players' Names"
+#~ msgstr "Andra spelares namn"
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Lager@@"
+#~ msgid "Own Name"
+#~ msgstr "Eget namn"
 
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Handla med %s@@"
+#~ msgid "GM Names"
+#~ msgstr "GM-namn"
 
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Sluta ignorera %s@@"
+#~ msgid "NPCs"
+#~ msgstr "NPC:er"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Utrusta@@"
+#~ msgid "Monsters"
+#~ msgstr "Monster"
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Avrusta@@"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Okänt föremålsslag"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Använd@@"
+#~ msgid "Generics"
+#~ msgstr "Allmänna föremål"
+
+#~ msgid "Hats"
+#~ msgstr "Huvudbonader"
+
+#~ msgid "Usables"
+#~ msgstr "Förbrukningsvaror"
+
+#~ msgid "Shirts"
+#~ msgstr "Tröjor"
 
 #, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Tillträde nekat"
+#~ msgid "One Handed Weapons"
+#~ msgstr "Enhandsvapen"
 
-#~ msgid "Ammo"
-#~ msgstr "Ammunition"
+#~ msgid "Pants"
+#~ msgstr "Byxor"
 
-#~ msgid "Arms"
-#~ msgstr "Handskar"
+#~ msgid "Shoes"
+#~ msgstr "Skor"
 
-#~ msgid "Attack:"
-#~ msgstr "Attack:"
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Enhandsvapen"
 
-#~ msgid "Axe"
-#~ msgstr "Yxa"
+#~ msgid "Shields"
+#~ msgstr "Sköldar"
 
-#~ msgid "Background"
-#~ msgstr "Bakgrund"
+#~ msgid "Rings"
+#~ msgstr "Ringar"
 
-#~ msgid "Bow"
-#~ msgstr "BÃ¥ge"
+#~ msgid "Necklaces"
+#~ msgstr "Halsband"
 
-#~ msgid "Buddy"
-#~ msgstr "Kompis"
+#~ msgid "Arms"
+#~ msgstr "Handskar"
 
-#~ msgid "Buddy List"
-#~ msgstr "Kompislista"
+#~ msgid "Ammo"
+#~ msgstr "Ammunition"
 
-#~ msgid "Buddys"
-#~ msgstr "Kompisar"
+#~ msgid "Particle Effects"
+#~ msgstr "Partikeleffekter"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Använd testmagi 1"
+#~ msgid "Pickup Notification"
+#~ msgstr "Upplocksnotis"
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Använd testmagi 2"
+#~ msgid "Exp Notification"
+#~ msgstr "XP-notifiering"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Använd testmagi 3"
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Spelare slår monster"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Kommando: /new <grupp>"
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monster slår spelare"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Ansluter till kontoservern..."
+#~ msgid "Critical Hit"
+#~ msgstr "Kritisk träff"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Ansluter till karaktärsservern..."
+#~ msgid "Misses"
+#~ msgstr "Missar"
 
-#~ msgid "Cost"
-#~ msgstr "Kostnad"
+#~ msgid "HP Bar"
+#~ msgstr "Full hälsostapel"
 
-#~ msgid "Couldn't set "
-#~ msgstr "Kunde inte välja "
+#~ msgid "3/4 HP Bar"
+#~ msgstr "Trekvarts hälsostapel"
 
-#~ msgid "Craft"
-#~ msgstr "Hantverk"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "Halv hälsostapel"
 
-#~ msgid "Crafts"
-#~ msgstr "Hantverk"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "Kvarts hälsostapel"
+
+#~ msgid "no"
+#~ msgstr "nej"
+
+#~ msgid "Buddy"
+#~ msgstr "Kompis"
+
+#~ msgid "Buddy List"
+#~ msgstr "Kompislista"
 
 #~ msgid "Description: %s"
 #~ msgstr "Beskrivning: %s"
@@ -3971,227 +3829,260 @@ msgstr "namnlös"
 #~ msgid "Effect: %s"
 #~ msgstr "Effekt: %s"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Kunde inte byta till "
+#~ msgid "Previous"
+#~ msgstr "Föregående"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#~ msgid "New"
+#~ msgstr "Ny"
 
-#~ msgid "Generics"
-#~ msgstr "Allmänna föremål"
+#~ msgid "Job Level: %d"
+#~ msgstr "Jobbnivå: %d"
 
-#~ msgid "Guilds"
-#~ msgstr "Gillen"
+#~ msgid "Present: "
+#~ msgstr "Närvarande: "
 
-#~ msgid "HP Bar"
-#~ msgstr "Full hälsostapel"
+#~ msgid "Quit Guild"
+#~ msgstr "Lämna gille"
 
-#~ msgid "Hats"
-#~ msgstr "Huvudbonader"
+#~ msgid "Ok"
+#~ msgstr "Okej"
 
-#~ msgid "Highlight"
-#~ msgstr "Markering"
+#~ msgid "Recent:"
+#~ msgstr "Senaste:"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Länk"
+#~ msgid "Magic"
+#~ msgstr "Magi"
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr ""
-#~ "För tillfället är det inte möjligt att bjuda in något på det här viset."
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Använd testmagi 1"
 
-#~ msgid "Is"
-#~ msgstr "Är"
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Använd testmagi 2"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Du har utrustat dig"
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Använd testmagi 3"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Den är för dyr"
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Tvåhandsvapen"
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Jobbnivå: %d"
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Handla med %s@@"
 
-#~ msgid "Knife"
-#~ msgstr "Kniv"
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Attackera %s@@"
 
-#~ msgid "Logger"
-#~ msgstr "Loggning"
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Strunta i %s@@"
 
-#~ msgid "Mace"
-#~ msgstr "Spikklubba"
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignorera %s@@"
 
-#~ msgid "Magic"
-#~ msgstr "Magi"
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Sluta ignorera %s@@"
 
-#~ msgid "Max level"
-#~ msgstr "Maxnivå"
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Sparka spelare@@"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Mystisk förmåga"
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Avbryt@@"
 
-#~ msgid "NPC Number Request"
-#~ msgstr "NPC-nummerefterfrågan"
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Plocka upp %s@@"
 
-#~ msgid "NPC Text Request"
-#~ msgstr "NPC-textefterfrågan"
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Avrusta@@"
 
-#~ msgid "Necklaces"
-#~ msgstr "Halsband"
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Utrusta@@"
 
-#~ msgid "New"
-#~ msgstr "Ny"
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Använd@@"
 
-#~ msgid "Ok"
-#~ msgstr "Okej"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Släpp@@"
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Enhandsvapen"
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Dela@@"
 
-#~ msgid "Pants"
-#~ msgstr "Byxor"
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Lager@@"
 
-#~ msgid "Party Window"
-#~ msgstr "Gruppfönster"
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Hämta@@"
 
-#~ msgid "Player"
-#~ msgstr "Spelare"
+#~ msgid "Select Server"
+#~ msgstr "Välj server"
 
-#~ msgid "Polearm"
-#~ msgstr "Spjut"
+#~ msgid "Failed to switch to "
+#~ msgstr "Kunde inte byta till "
 
-#~ msgid "Present: "
-#~ msgstr "Närvarande: "
+#~ msgid "windowed"
+#~ msgstr "fönster"
 
-#~ msgid "Previous"
-#~ msgstr "Föregående"
+#~ msgid "fullscreen"
+#~ msgstr "helskärms"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Förloppsindikatoretiketter"
+#~ msgid "Mystery Skill"
+#~ msgstr "Mystisk förmåga"
 
-#~ msgid "Quit Guild"
-#~ msgstr "Lämna gille"
+#~ msgid "Weapons"
+#~ msgstr "Vapen"
 
-#~ msgid "Recent:"
-#~ msgstr "Senaste:"
+#~ msgid "Crafts"
+#~ msgstr "Hantverk"
+
+#~ msgid "Stats"
+#~ msgstr "Statistik"
+
+#~ msgid "Total"
+#~ msgstr "Totalt"
+
+#~ msgid "Cost"
+#~ msgstr "Kostnad"
+
+#~ msgid "Attack:"
+#~ msgstr "Attack:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% Reflexer:"
 
 #~ msgid "Remaining Status Points: %d"
 #~ msgstr "Återstående statuspoäng: %d"
 
-#~ msgid "Rings"
-#~ msgstr "Ringar"
+#~ msgid "Max level"
+#~ msgstr "Maxnivå"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Tröghet för rullning"
+#~ msgid "curl error "
+#~ msgstr "curl-fel "
 
-#~ msgid "Scroll radius"
-#~ msgstr "Rullningsradie"
+#~ msgid " host: "
+#~ msgstr " värd: "
 
-#~ msgid "Select Server"
-#~ msgstr "Välj server"
+#~ msgid "Guilds"
+#~ msgstr "Gillen"
 
-#~ msgid "Server"
-#~ msgstr "Server"
+#~ msgid "Buddys"
+#~ msgstr "Kompisar"
 
-#~ msgid "Shields"
-#~ msgstr "Sköldar"
+#~ msgid "Party Window"
+#~ msgstr "Gruppfönster"
 
-#~ msgid "Shirts"
-#~ msgstr "Tröjor"
+#~ msgid "Unarmed"
+#~ msgstr "Obeväpnad"
 
-#~ msgid "Shoes"
-#~ msgstr "Skor"
+#~ msgid "Knife"
+#~ msgstr "Kniv"
 
-#~ msgid "Shooting"
-#~ msgstr "Skjutvapen"
+#~ msgid "Sword"
+#~ msgstr "Svärd"
 
-#~ msgid "Slots: "
-#~ msgstr "Utrymme: "
+#~ msgid "Polearm"
+#~ msgstr "Spjut"
 
 #~ msgid "Staff"
 #~ msgstr "Stav"
 
-#~ msgid "Stats"
-#~ msgstr "Statistik"
+#~ msgid "Whip"
+#~ msgstr "Piska"
 
-#~ msgid "Sword"
-#~ msgstr "Svärd"
+#~ msgid "Bow"
+#~ msgstr "BÃ¥ge"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Flikmarkering"
+#~ msgid "Shooting"
+#~ msgstr "Skjutvapen"
 
-#~ msgid "Text Outline"
-#~ msgstr "Textkontur"
+#~ msgid "Mace"
+#~ msgstr "Spikklubba"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Textskugga"
+#~ msgid "Axe"
+#~ msgstr "Yxa"
 
 #~ msgid "Thrown"
 #~ msgstr "Kastvapen"
 
-#~ msgid "Total"
-#~ msgstr "Totalt"
+#~ msgid "Craft"
+#~ msgstr "Hantverk"
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Enhandsvapen"
+#~ msgid "Unknown Skill"
+#~ msgstr "Okänd förmåga"
 
-#~ msgid "Unable to load selection.png"
-#~ msgstr "Kan inte ladda selection.png"
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " kan inte skapas och existerar inte! Avslutar."
 
-#~ msgid "Unarmed"
-#~ msgstr "Obeväpnad"
+#~ msgid "Couldn't set "
+#~ msgstr "Kunde inte välja "
 
-#~ msgid "Unknown Skill"
-#~ msgstr "Okänd förmåga"
+#~ msgid " video mode: "
+#~ msgstr " -videoläge: "
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Kunde inte välja karaktär av okänd anledning"
+#~ msgid "mana"
+#~ msgstr "mana"
+
+#~ msgid "Connecting to character server..."
+#~ msgstr "Ansluter till karaktärsservern..."
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "Ansluter till kontoservern..."
+
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Alias för /create"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Kommando: /new <grupp>"
+
+#~ msgid "a"
+#~ msgstr "en"
 
 #~ msgid "Unnamed"
 #~ msgstr "Namnlös"
 
-#~ msgid "Usables"
-#~ msgstr "Förbrukningsvaror"
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@pickup|Plocka upp %s@@"
 
-#~ msgid "Weapons"
-#~ msgstr "Vapen"
+#~ msgid "Scroll radius"
+#~ msgstr "Rullningsradie"
 
-#~ msgid "Whip"
-#~ msgstr "Piska"
+#~ msgid "Scroll laziness"
+#~ msgstr "Tröghet för rullning"
 
-#~ msgid "Whisper"
-#~ msgstr "Viskning"
+#~ msgid "Save player list"
+#~ msgstr "Kom ihåg spelarlista"
 
-#~ msgid "Willpower:"
-#~ msgstr "Viljestyrka:"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "Kan inte ladda selection.png"
 
-#~ msgid "a"
-#~ msgstr "en"
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr ""
+#~ "\n"
+#~ "> Avbryt\n"
 
-#~ msgid "curl error "
-#~ msgstr "curl-fel "
+#~ msgid "skills.xml"
+#~ msgstr "skills.xml"
 
-#~ msgid "fullscreen"
-#~ msgstr "helskärms"
+#~ msgid "monsters.xml"
+#~ msgstr "monsters.xml"
 
 #~ msgid "items.xml"
 #~ msgstr "items.xml"
 
-#~ msgid "mana"
-#~ msgstr "mana"
+#~ msgid "NPC Text Request"
+#~ msgstr "NPC-textefterfrågan"
 
-#~ msgid "monsters.xml"
-#~ msgstr "monsters.xml"
+#~ msgid "NPC Number Request"
+#~ msgstr "NPC-nummerefterfrågan"
 
-#~ msgid "no"
-#~ msgstr "nej"
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
 
-#~ msgid "skills.xml"
-#~ msgstr "skills.xml"
+#~ msgid "  -D --default    : Bypass the login process with default settings"
+#~ msgstr ""
+#~ "  -D --default    : Kringgå inloggningsprocessen och använd "
+#~ "grundinställningarna"
 
-#~ msgid "windowed"
-#~ msgstr "fönster"
+#~ msgid "Slots: "
+#~ msgstr "Utrymme: "
+
+#~ msgid " cancelled"
+#~ msgstr " avbruten"
diff --git a/po/te.po b/po/te.po
index 9b4625ad..f24ea08a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-10-13 03:45+0000\n"
 "Last-Translator: వీవెన� (Veeven) <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
@@ -19,470 +19,450 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "ప�రవేశించ�"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "పొరపాట�"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "సంకేతపదం:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "గ�ర�త�తెలియని ఆదేశం."
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- సహాయం--"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "మరింత సమాచారం కోసం,  /help <ఆదేశం> అని టైప� చెయ�యండి."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:274
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -491,39 +471,39 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr "సాధారణ"
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -537,34 +517,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "వెల: %s / మొత�తం: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "నిష�క�రమించ�"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "గరిష�ఠ"
 
@@ -578,11 +558,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "రద�ద�చేయి"
@@ -655,14 +635,14 @@ msgstr ""
 msgid "Name:"
 msgstr "పేర�:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -679,8 +659,8 @@ msgstr "వెంట�ర�కల రంగ�:"
 msgid "Hair style:"
 msgstr "వెంట�ర�కల శైలి:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "సృష�టించ�"
 
@@ -736,8 +716,8 @@ msgstr ""
 msgid "Change Email"
 msgstr "ఈమెయిల� చిర�నామాని మార�చ�"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "తొలగించ�"
 
@@ -746,24 +726,24 @@ msgstr "తొలగించ�"
 msgid "Choose"
 msgstr "రంగ�ల�"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -829,8 +809,8 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
@@ -838,7 +818,7 @@ msgstr ""
 msgid "Help"
 msgstr "సహాయం"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
@@ -850,80 +830,83 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "బర�వ�:"
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "సరే"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "అన�నీ"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "బర�వ�: "
@@ -952,40 +935,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "పటం"
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "తద�పరి"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1000,7 +983,7 @@ msgstr ""
 msgid "Send"
 msgstr "పంపించ�"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1086,7 +1069,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1158,56 +1141,56 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1244,51 +1227,51 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "రంగ�ల�"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "à°°à°•à°‚: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "ఇంద�ర ధనస�స�"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1372,27 +1355,31 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "ఆటగాళ�ళ�"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1448,487 +1435,459 @@ msgstr ""
 msgid "max"
 msgstr "గరిష�ఠ"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "నిండ�తెర"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "కాద�"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "స�థాయి: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "స�థాయి: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "సృష�టించ�"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "స�థాయి: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "స�థాయి: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1967,78 +1926,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2115,53 +2002,53 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2185,388 +2072,401 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2574,91 +2474,91 @@ msgstr ""
 msgid "Unknown error."
 msgstr "గ�ర�త�తెలియని ఆదేశం."
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "గ�ర�త�తెలియని ఆదేశం."
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "గ�ర�త�తెలియని ఆదేశం."
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2737,11 +2637,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2751,188 +2651,136 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "గ�ర�త�తెలియని ఆదేశం."
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "ఆటగాడ�"
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2946,71 +2794,116 @@ msgstr "పేర�"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "తొలగించ�"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3055,27 +2948,27 @@ msgstr ""
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3151,15 +3044,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3167,15 +3060,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3183,15 +3076,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3248,7 +3141,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3256,242 +3149,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3507,52 +3395,43 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
@@ -3574,6 +3453,10 @@ msgstr ""
 #~ msgid "Rings"
 #~ msgstr "ఉంగరాల�"
 
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "స�థాయి: %d"
+
 #~ msgid "no"
 #~ msgstr "కాద�"
 
diff --git a/po/th.po b/po/th.po
index 58399665..79b857b7 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-11-06 15:29+0000\n"
 "Last-Translator: Krit Marukawisutthigul <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -19,472 +19,452 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "ตั้งค่า"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "�ำลังเชื่อมต่อ..."
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "เข้าระบบ"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "�ำลังเชื่อมต่อ..."
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "รหัสผ่าน:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:274
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -493,39 +473,39 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -539,34 +519,34 @@ msgstr ""
 msgid "Buy"
 msgstr "ซื้อ"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "ออ�"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -580,11 +560,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "ย�เลิ�"
@@ -657,14 +637,14 @@ msgstr "สร้างตัวละคร"
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -681,8 +661,8 @@ msgstr "สีผม:"
 msgid "Hair style:"
 msgstr "ทรงผม:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "สร้าง"
 
@@ -738,8 +718,8 @@ msgstr ""
 msgid "Change Email"
 msgstr "เปลี่ยนที่อยู่ Email"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "ลบทิ้ง"
 
@@ -747,24 +727,24 @@ msgstr "ลบทิ้ง"
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -830,8 +810,8 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
@@ -839,7 +819,7 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
@@ -851,81 +831,84 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "ใช้"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "ทิ้ง"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "ทิ้ง"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -954,40 +937,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "ถัดไป"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1002,7 +985,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1088,7 +1071,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1160,57 +1143,57 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "�ำลังเชื่อมต่อ..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1247,50 +1230,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1374,27 +1357,31 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1450,487 +1437,459 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "ไม่"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "เลเวล: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "เลเวล: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "คุณ�น่ใจ�ล้วหรือที่จะลบตัวละครนี้?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "คุณ�น่ใจ�ล้วหรือที่จะลบตัวละครนี้?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "เลเวล: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "เลเวล: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1969,78 +1928,6 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2117,53 +2004,53 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2187,478 +2074,491 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2737,11 +2637,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2751,187 +2651,134 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Willpower:"
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Strength:"
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Agility:"
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitality:"
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2945,71 +2792,116 @@ msgstr "ชื่อ:"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "ลบทิ้ง"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3054,27 +2946,27 @@ msgstr ""
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3150,15 +3042,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3166,15 +3058,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3182,15 +3074,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3247,7 +3139,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3255,242 +3147,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Invited user %s to party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:340
-#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3506,58 +3393,57 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "เลเวล: %d"
+
 #~ msgid "Willpower:"
 #~ msgstr "Willpower:"
 
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Willpower:"
+
 #~ msgid "Description: %s"
 #~ msgstr "รายละเอียด: %s"
 
diff --git a/po/tr.po b/po/tr.po
index f0bf74ce..b3ddf5c2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-02-12 09:43+0000\n"
 "Last-Translator: Bekir AVCI <bilgi@turkuazyakit.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -19,482 +19,459 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Kur"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Sunucu bekleniyor"
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Oturum Aç"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Sunucu"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Hata"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Åžifre:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "DeÄŸiÅŸtir"
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Hesabı Kapat"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Bilinmeyen komut."
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Yardım --"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Bu yardımı görüntüler"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "Harita adını gösterir"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Çevirimiçi kullanıcı sayısını görüntüler"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Hakkınızda birşey yazın"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Bu pencereyi temizler"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Bir kullanıcıya özel mesaj gönder"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias of msg"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Alias of msg"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Diğer kullanıcılarla özel mesajlar için bir sekme yaratır."
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Bütün genel kanalları gösterir"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "Bir kanala katıl veya bir kanal oluştur"
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "Guruba bir kullanıcı davet et."
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "Guruba bir kullanıcı davet et."
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "Yazışmayı bir dış dosyaya kaydet."
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "Genel duyuru (yalnız GM)"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Daha fazla bilgi için ,yardım/yaz <komut>."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Komut: /yardım"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Bu komut kullanılabilir bütün komutların bir  listesini gösterir."
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Komut: /help <command>"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Bu komut  <komut> hakkında yardımı gösterir."
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Komut: / duyuru <msg>"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** Sadece GM  için  mevcut ***"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Bu komut şuanda çevirimiçi olan bütün oyunculara mesaj <msg> gönderir."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Komut : /clear"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Bu komut önceki yazışma girdilerini siler."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Komut: /join <channel>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Bu komut şu anda çevrimiçi oyuncu sayısını gösterir."
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Komut: /join <channel>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Komut: /list"
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Komut: /me <message>"
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Komut: /msg <nick> <message>"
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Komut: /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Komut: /w <nick> <message>"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Komut: /query <nick>"
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Komut: /q <nick>"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Komut: /w <nick> <message>"
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-#, fuzzy
-msgid "Command: /away"
-msgstr "Komut:  /who"
-
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Bu komut önceki yazışma girdilerini siler."
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Komut: /party <nick>"
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Komut: /party <nick>"
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Bu komut <nick> adlı kişiyi partinize davet eder."
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Komut: /present"
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Komut: /record <filename>"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Komut: /record"
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Komut: /toggle <state>"
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Komut: /toggle"
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Komut: / duyuru <msg>"
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Komut:  /where"
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Bu komut geçerli haritanın adını gösterir."
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Komut:  /who"
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Bu komut şu anda çevrimiçi oyuncu sayısını gösterir."
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Komutların bir listesi için /help yazın."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Sohbeti kapatır."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -503,42 +480,42 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr "Genel"
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Ekran Görüntüsü"
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Ekrangörüntüsü kaydı başarısız."
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Sunucu bağlantısı koptu,Program şimdi kapatılacak"
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Gelen takas istekleri görmezden geliniyor."
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Harita yüklenemedi"
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -552,34 +529,34 @@ msgstr "Parti"
 msgid "Buy"
 msgstr "Satın al"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Fiyat: %s / Toplam: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Çıkış"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "En Fazla"
 
@@ -593,11 +570,11 @@ msgstr "Satış"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Ä°ptal"
@@ -670,14 +647,14 @@ msgstr "Karakter oluÅŸturma"
 msgid "Name:"
 msgstr "Ä°sim:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -694,8 +671,8 @@ msgstr "Saç Rengi:"
 msgid "Hair style:"
 msgstr "Saç Stili:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "OluÅŸtur"
 
@@ -751,8 +728,8 @@ msgstr "Hesabı Kapat"
 msgid "Change Email"
 msgstr "DeÄŸiÅŸtir"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Sil"
 
@@ -761,24 +738,24 @@ msgstr "Sil"
 msgid "Choose"
 msgstr "Kapat"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Sohbet"
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -844,8 +821,8 @@ msgstr ""
 msgid "Equipment"
 msgstr "Ekipman"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
@@ -853,7 +830,7 @@ msgstr ""
 msgid "Help"
 msgstr "Yardım"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Kapat"
 
@@ -865,80 +842,83 @@ msgstr "Envanter"
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Donatmak"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Kullan"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Bölme"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Ağırlık:"
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr "Depo"
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr "Almak"
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Tamam"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Hepsi"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Ağırlık: "
@@ -969,40 +949,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Harita"
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Sunucu bekleniyor"
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Sonraki"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Sıfırla"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1017,7 +997,7 @@ msgstr "Alıcı:"
 msgid "Send"
 msgstr "Gönder"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1104,7 +1084,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1176,61 +1156,61 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "Parolalar uyuÅŸmuyor."
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Sunucu Seçin"
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Sunucu:"
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Bağlantı Noktası:"
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Sunucu:"
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Bağlanıyor..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Sunucu"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Sunucu bekleniyor"
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1268,54 +1248,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Türü: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Sabit"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Darbe"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Gökkuşağı"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "BaÅŸlat"
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Kırmızı: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "YeÅŸil: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Mavi: "
@@ -1401,28 +1381,32 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Adı göster"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Oyuncular"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1478,503 +1462,470 @@ msgstr "orta"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Tam ekran"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Adı göster"
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "sohbet"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 #, fuzzy
 msgid "Show damage"
 msgstr "Adı göster"
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Yazı tipi boyutu"
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Hayır"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Değişikliklerin etkili olması için yeniden başlatılması gerekli."
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL deÄŸiÅŸikliklerini uygulamak yeniden baÅŸlatma gerektirir."
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Ekran çözünürlüğü değiştirildi"
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Beceriler"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Yukarı"
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Beceriler"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Seviye: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Seviye: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Birlik oluÅŸturma"
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Çıkmak istediğinize emin misiniz?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "Guruba bir kullanıcı davet et."
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "Guruba bir kullanıcı davet et."
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Çıkmak istediğinize emin misiniz?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Birlik oluÅŸturma"
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Karakter oluÅŸturma"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Büyük"
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Birlik"
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Sunucu Seçin"
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Parti"
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Sunucu Seçin"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Seviye: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Ä°ÅŸ:"
 
-#: src/gui/statuswindow.cpp:203
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "Para: %d"
-
-#: src/gui/statuswindow.cpp:234
-#, fuzzy
-msgid "Job"
-msgstr "Ä°ÅŸ:"
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Karakter Ä°statistik Tamam"
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Seviye: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Ticaret"
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Ekle"
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "DeÄŸiÅŸtir"
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Yeterli para yok."
 
@@ -2013,82 +1964,6 @@ msgstr ""
 msgid "Completed"
 msgstr "Tamamlandı"
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Diğer oyuncuların isimleri"
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "GM isimleri"
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPCs"
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Canavarlar"
-
-#: src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Parti"
-
-#: src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Birlik"
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Diğer oyuncuların isimleri"
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Kritik Hit"
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Kritik Hit"
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2165,55 +2040,55 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Global duyuru:"
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Komut: /close"
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Komut:  /where"
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Bu komut şu anda çevrimiçi oyuncu sayısını gösterir."
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2240,394 +2115,407 @@ msgstr "DeÄŸiÅŸtir"
 msgid "Choose World"
 msgstr "Sunucu Seçin"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Yukarı Taşı"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Aşağı Taşı"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Sola Taşı"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Sağa Taşı"
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Saldırı"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "KonuÅŸ"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Hedef Oyuncu"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Hedef Oyuncu"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Ekran Görüntüsü"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Durum penceresi"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Sohbet Penceresi"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Hata Ayıklama Penceresi"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Durum penceresi"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Durum penceresi"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/help > Bu yardımı görüntüler"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
 msgid "Character's stats are too high."
 msgstr "Karakter Ä°statistik Tamam"
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 #, fuzzy
 msgid "Character's stats are too low."
 msgstr "Karakter Ä°statistik Tamam"
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2635,92 +2523,92 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Bilinmeyen komut."
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Bilinmeyen komut."
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 #, fuzzy
 msgid "Error joining channel."
 msgstr "Komut: /join <channel>"
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "Bilinmeyen komut."
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2799,11 +2687,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2813,188 +2701,136 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Güçlülük"
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Çeviklik"
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Maharet"
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "yaşama gücü"
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Istihbarat"
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Bilinmeyen komut."
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Oyuncu"
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -3008,73 +2844,118 @@ msgstr "Ä°sim"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Güçlülük"
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Çeviklik"
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "yaşama gücü"
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Istihbarat"
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Maharet"
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Åžans"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Savunma:"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Saldırı"
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Savunma:"
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Kritik Hit"
@@ -3122,27 +3003,27 @@ msgstr "Bu komut geçerli haritanın adını gösterir."
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3218,15 +3099,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3234,15 +3115,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3250,15 +3131,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3316,7 +3197,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3324,242 +3205,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
-#, fuzzy, c-format
-msgid "Invited user %s to party."
-msgstr "Guruba bir kullanıcı davet et."
-
-#: src/net/tmwa/partyhandler.cpp:340
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3575,53 +3451,44 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 #, fuzzy
 msgid "Completely ignore"
 msgstr "Tamamlandı"
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr "isimsiz"
 
@@ -3651,6 +3518,18 @@ msgstr "isimsiz"
 #~ msgid "Server"
 #~ msgstr "Sunucu"
 
+#~ msgid "Other Players' Names"
+#~ msgstr "Diğer oyuncuların isimleri"
+
+#~ msgid "GM Names"
+#~ msgstr "GM isimleri"
+
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
+
+#~ msgid "Monsters"
+#~ msgstr "Canavarlar"
+
 #~ msgid "Unknown Item Type"
 #~ msgstr "Bilinmeyen Öğe Türü"
 
@@ -3678,6 +3557,9 @@ msgstr "isimsiz"
 #~ msgid "Arms"
 #~ msgstr "Silah"
 
+#~ msgid "Critical Hit"
+#~ msgstr "Kritik Hit"
+
 #~ msgid "HP Bar"
 #~ msgstr "HP Bar"
 
@@ -3690,6 +3572,30 @@ msgstr "isimsiz"
 #~ msgid "1/4 HP Bar"
 #~ msgstr "1/4 HP Bar"
 
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
+
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
+
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
+
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Para: %d"
+
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Ä°ÅŸ:"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Seviye: %d"
+
 #~ msgid "no"
 #~ msgstr "hayır"
 
diff --git a/po/uk.po b/po/uk.po
index 16268d17..778a2a42 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,359 +7,337 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
-"PO-Revision-Date: 2010-12-06 19:36+0100\n"
-"Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
+"PO-Revision-Date: 2009-10-16 13:01+0000\n"
+"Last-Translator: tivasyk <tivasyk@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"%10<=4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "�алаштуванн�"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Очікуванн� відповіді �ервера"
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Логін"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Вимагаєть�� приєднанн� до каналу %s."
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Сервер"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Помилка"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Пароль:"
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Заміна"
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "�е зареє�трований"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "�евідомий �ервер оновленн�: "
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "�еможливо �творити теку дл� оновлень!"
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Чорт зна �ка команда"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Довідка --"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Показати це вікно"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Показати ім'� мапи"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Показати кількі�ть гравців он-лайн"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Розказати що�ь про �ебе"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Очи�тити оце вікно"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > �аді�лати приватне повідомленн� кори�тувачеві"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Варіант msg"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Варіант msg"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Створює закладку дл� приватної розмови з іншим кори�тувачем"
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Варіант query"
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Показати у�і публічні канали"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Приєднати�ь чи �творити канал"
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/party > Запро�ити гравц� до групи"
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Запро�ити гравц� до групи"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Розпочати запи� чату у зовнішній файл"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > В�тановити, чи \"Ентер\" перемикатиме ва� на вікно чату"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Показати �пи�ок в�іх гравців он-лайн (над�илає в лог чату, �кщо "
 "увімкнена опці� логу чату)"
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Глобальне оголошенн� (лише дл� GM)"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Хочете знати більше - введіть /help <команда>."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Команда: /help"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Ц� команда показує �пи�ок в�іх до�тупних команд"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Команда: /help <_команда_>"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Ц� команда відображає коротку інформацію про <_команда_>"
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Команда: /announce <_тек�т_>"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** до�тупне лише дл� GM ***"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Ц� команда над�илає <_тек�т_> в�ім гравц�м, що знаход�ть�� в режимі он-лайн"
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Команда: /clear"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Ц� команда очищає вікно логу чату від попередніх повідомлень"
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Команда: /join <_канал_>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Відображає кількі�ть гравців он-лайн"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Команда: /join <_канал_>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Ц� команда приєднує ва� до <_канал_>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Якщо <_канал_> не і�нує, він буде �творений"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Команда: /list"
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Ц� команда показує �пи�ок в�іх до�тупних каналів"
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Команда: /me <_тек�т_>"
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Ц� команда каже в�ім гравц�м <_тек�т_> (або що ви робите)"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Команда: /msg <_ім'�_> <_тек�т_>"
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Команда: /whisper <_ім'�_> <_тек�т_>"
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Команда: /w <_ім'�_> <_тек�т_>"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Ц� команда над�илає <_тек�т_> гравцеві <_ім'�_>."
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
-"Якщо <_ім'�_> мі�тить пробіли, візьміть в�е _ім'�_ в подвійні лапки (\")"
+"Якщо <_ім'�_> мі�тить пробіли, візьміть в�е _ім'�_ в подвійні лапки (\r\n"
+"name surname\")"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Команда: /query <_ім'�_>"
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Команда: /q <_ім'�_>"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Ц� команда намагаєть�� �творити закладинку дл� перешіптуванн� між вами та "
 "гравцем <_ім'�_>"
 
-#: src/commandhandler.cpp:270
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Команда: /w <_ім'�_> <_тек�т_>"
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-#, fuzzy
-msgid "Command: /away"
-msgstr "Команда: /who"
-
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Ц� команда в�тановлює тему каналу"
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Команда: /party <_ім'�_>"
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Ц� команда приєднує ва� до <_канал_>"
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Команда: /party <_ім'�_>"
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Ц� команда запрошує гравц� <_ім'�_> до ва� в групу"
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Команда: /present"
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -367,28 +345,28 @@ msgstr ""
 "Ц� команда отримує �пи�ок гравців, �кі можуть почути ва� і над�илає його або "
 "в файл логу чату (�кщо увімкнена опці� веденн� логу), або до вікна чату"
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Команда: /record <_файл_>"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Ц� команда вмикає веденн� журналу чату (запи�ує ве�ь вмі�т чату у <_файл_>)"
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Команда: /record"
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Завершує веденн� журналу (логу) чату"
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Команда: /toggle <_режим_>"
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -396,7 +374,7 @@ msgstr ""
 "Ц� команда в�тановлює, чи буде нати�ненн� клавіші Enter автоматично "
 "перемикатиме на вікно чату"
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -404,48 +382,48 @@ msgstr ""
 "<_режим_> може бути \"1\", \"yes\", або \"true\" щоб увімкнути опцію, або ж "
 "\"0\", \"no\", чи \"false\" щоб вимкнути її."
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Команда: /toggle"
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "Показує режим клавіші Enter"
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Команда: /announce <_тек�т_>"
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Команда: /where"
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Показує назву поточної локації"
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Команда: /who"
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Відображає кількі�ть гравців он-лайн"
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Введіть /help щоб побачити �пи�ок в�іх команд"
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "�е можна над�илати порожні повідомленн�!"
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -454,65 +432,65 @@ msgstr ""
 "�еможливо �творити закладинку дл� �пілкуванн� з гравцем \"%s\" - або така "
 "вже і�нує, або ви намагаєте�ь перешіптувати�ь �ам з �обою =Р"
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Вимагаєть�� приєднанн� до каналу %s."
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "Enter перемикає на чат"
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Повідомленн� закриваж вікно чату"
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "Enter тепер перемикає на вікно чату"
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Тепер повідомленн� закриватиме вікно чату"
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -523,42 +501,42 @@ msgstr ""
 "Можливими опці�ми дл� /%s є: \"yes\", \"no\", \"true\", \"false\", \"1\", "
 "\"0\"."
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr "Загальне"
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Фотознімок екрану (�кріншот) збережено до теки ~/"
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Збереженн� �кріншоту провалило�ь!"
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Втрачено з'єднанн� з �ервером, програма завершуєть���"
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Мережева помилка"
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ігноруванн� вхідних пропозицій торгівлі"
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Прийманн� вхідних пропозицій торгівлі"
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "�еможливо завантажити локацію"
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Помилка під ча� завантаженн� %s"
@@ -572,34 +550,34 @@ msgstr "Група (%s)"
 msgid "Buy"
 msgstr "Придбати"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Ціна: %s / Загалом: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Вийти"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Мак�имум"
 
@@ -613,11 +591,11 @@ msgstr "Продати"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Ска�увати"
@@ -692,14 +670,14 @@ msgstr "Створити пер�онажа"
 msgid "Name:"
 msgstr "Ім'�"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -716,8 +694,8 @@ msgstr "Колір воло���:"
 msgid "Hair style:"
 msgstr "Зачі�ка:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Створити"
 
@@ -773,8 +751,8 @@ msgstr "�е зареє�трований"
 msgid "Change Email"
 msgstr "Змінити адре�у електронної пошти"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Видалити"
 
@@ -783,24 +761,24 @@ msgstr "Видалити"
 msgid "Choose"
 msgstr "Закрити"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Чат"
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d гравців он-лайн"
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "�удиторі� зане�ена до журналу"
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Шепчу до %s: %s"
@@ -866,8 +844,8 @@ msgstr "Звуки оточенн�"
 msgid "Equipment"
 msgstr "Обладунки"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Зн�ти"
 
@@ -875,7 +853,7 @@ msgstr "Зн�ти"
 msgid "Help"
 msgstr "Довідка"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Закрити"
 
@@ -887,81 +865,84 @@ msgstr "Сумка"
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr "Комірки"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Зн�ти"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Викори�тати"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Викинути"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Поділити"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Вага:"
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Викинути"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Ок"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "В�е"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Вкажіть кількі�ть предметів"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Вкажіть кількі�ть предметів, щоб викинути"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Вкажіть кількі�ть предметів дл� зберіганн�"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Вкажіть кількі�ть предметів дл� отриманн�"
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Вкажіть кількі�ть предметів дл� розподілу"
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Вага: "
@@ -992,40 +973,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Локаці�"
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Очікуванн� відповіді �ервера"
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Далі"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Підтвердити"
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Спробувати знову"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1040,7 +1021,7 @@ msgstr "Дл�:"
 msgid "Send"
 msgstr "�аді�лати"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "�еможливо наді�лати, так �к адре�ант або ли�т некорректні"
 
@@ -1129,7 +1110,7 @@ msgstr "@@name|додати ім'� до чату@@"
 msgid "Pick up %s"
 msgstr "Підн�ти"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Додати до чату@@"
@@ -1202,61 +1183,61 @@ msgstr "Пароль повинен �кладати�ь менш, ніж з %d
 msgid "Passwords do not match."
 msgstr "�е ідентичні паролі!"
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Оберіть �ервер"
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Сервер:"
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "З'єдную�ь..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Кра�ивий вказівник"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Будь ла�ка, введіть порт і адре�у �ерверу"
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Очікуванн� відповіді �ервера"
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1294,54 +1275,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "О�ь, �к вигл�дає цей колір"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Кольори"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Тип: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Статичне"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Пуль�уюче"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Ве�елка"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Спектр"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Затримка: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Червоний: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Зелений: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Синій: "
@@ -1427,28 +1408,32 @@ msgstr "Ігнорувати повні�тю"
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Дозволити торгівлю"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Дозволити шепіт (приватне �пілкуванн�)"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Шепіт (приватне �пілкуванн�) в окремих вкладках"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Показувати ім'�"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Гравці"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
@@ -1504,510 +1489,480 @@ msgstr "�ередній"
 msgid "max"
 msgstr "мак�имальний"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "�а повний екран"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Кра�ивий вказівник"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Видимі імена"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Ефекти ча�тинок"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Показувати ім'�"
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Повідомл�ти, коли підн�то предмет"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "у балачці"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "�к ча�тинки"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Обмеженн� ча�тоти кадрів"
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Відео"
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 #, fuzzy
 msgid "Show damage"
 msgstr "Показувати ім'�"
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "Тек�т зверху"
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Прозорі�ть інтерфей�у"
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Звуки оточенн�"
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Деталізаці� ефектів ча�тинок"
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Розмір шрифта"
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "�і"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "�евдало�� в�тановити режим і відновити попередній!"
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "�евдало�� в�тановити режим і відновити попередній!"
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Перемиканн� на повний екран"
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Потрібно перезапу�тити дл� за�то�уванн� змін"
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Перемиканн� OpenGL"
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Потрібно перезапу�тити дл� за�то�уванн� змін OpenGL"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Розподільчу здатні�ть в�тановлено"
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Перезавантажте клієнт, щоби за�то�увати зміни"
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "�алаштуванн� ефектів ча�тинок за�то�овано"
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "Зміни буде за�то�овано пі�л� завантаженн� мапи"
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "�авички"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "�авички"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Рівень: %d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Рівень: %d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Створити гільдію"
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Ви дій�но хочете вийти?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > Запро�ити гравц� до групи"
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Запро�ити гравц� до групи"
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Ви дій�но хочете вийти?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Створити гільдію"
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Створити пер�онажа"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Запро�ити гравц�"
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Великий"
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Прийн�то запрошенн� від %s."
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Відхилено запрошенн� від %s."
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Прийн�то запрошенн� від %s."
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Відхилено запрошенн� від %s."
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Гільді�"
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Оберіть �ервер"
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Отримано запрошенн� до групи, але одне вже є."
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s запрошує ва� до групи %s."
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Запрошенн� до групи прийн�то"
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Отримано запрошенн� до групи, але одне вже є."
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s запрошує ва� приєднати�ь до їх групи."
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s запрошує ва� до групи %s."
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s запрошує ва� приєднати�ь до їх групи."
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s запрошує ва� до групи %s."
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Запрошенн� до групи прийн�то"
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Група"
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Оберіть �ервер"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Рівень: %d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Кошти: %s"
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Профе�і�: %d"
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Профе�і�:"
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "Кошти: %d"
-
-#: src/gui/statuswindow.cpp:234
-#, fuzzy
-msgid "Job"
-msgstr "Профе�і�:"
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Характери�тики пер�онажа в нормі"
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "Рівень: %d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Запропонувати торгівлю"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Прийн�то. Чекаємо..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Згодити�� торгувати"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Згода. Чекаємо..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Торгівл�: ти"
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Обмін�ти��"
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Додати"
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Ти отримуєш: %s."
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Ти віддаєш: %s."
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Заміна"
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "�е вдаєть�� додати предмет. �е можна накладати предмети одного типу."
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "У тебе недо�татньо грошей!"
 
@@ -2047,84 +2002,6 @@ msgstr "##1 �пробувати ще раз пізніше"
 msgid "Completed"
 msgstr "Закінчено"
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "І�тота"
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "Імена інших гравців"
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "Вла�не ім'�"
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "Імена GM"
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPC"
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Тварюки"
-
-#: src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Група"
-
-#: src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Гільді�"
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "Ефекти ча�ток"
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "Повідомленн� про підбиранн�"
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "Повідомленн� про зміну до�віду"
-
-#: src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Гравець вдарив Тварюку"
-
-#: src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Тварюка вдарила гравц�"
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Критичний удар"
-
-#: src/gui/userpalette.cpp:107
-#, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "Гравець вдарив Тварюку"
-
-#: src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Критичний удар"
-
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr ""
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Промах"
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Показує перелік кори�тувачів поточного каналу"
@@ -2204,55 +2081,55 @@ msgstr "Потрібно вказати кори�тувача дл� призн
 msgid "Need a user to kick!"
 msgstr "Потрібно вказати кори�тувача дл� вигнанн� з каналу"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Глобальне повідомленн�:"
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Глобальне повідомленн� від %s:"
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s шепоче: "
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Чи ж можна говорити без �лів?"
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "Закрити вкладку приватної бе�іди"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Команда: /close"
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Ц� команда закриває вкладку приватної бе�іди"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Команда: /where"
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Відображає кількі�ть гравців он-лайн"
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
@@ -2281,407 +2158,421 @@ msgstr "Заміна"
 msgid "Choose World"
 msgstr "Оберіть �ервер"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Підн�ти"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Опу�тити"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Пере�унути вліво"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Пере�унути вправо"
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "�ападати"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Вибрати ціль і нападати"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Емоці�"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Розмовл�ти"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Зупинити напад"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Вибрати найближчу ціль"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Вибрати комп'ютерного пер�онажа"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Вибрати ігрока"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Підн�ти"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Сховати вікна"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "При�і�ти й відпочити"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Знімок екрану"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Дозволити/заборонити торгівлю"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Пр�мувати до вказівника миші"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Скорочений до�туп %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Вікно підказки"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Вікно �тану"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Вікно майна"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Вікно екіпіровки"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Вікно навичок"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Вікно мінімапи"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Вікно балачки"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Вікно �короченого до�тупу"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Вікно налаштувань"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Вікно зневажденн�"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Вікно навичок"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Вікно емоцій"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Вікно �тану"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Перейти до балачки"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Гортати балачку вище"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Гортати балачку нижче"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Попередн� вкладка балачки"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "�а�тупна вкладка балачки"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "�еобхідно у�унути повтори, інакше керуванн� може бути у�кладненим"
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Параметри:"
 
-#: src/main.cpp:44
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -h --help : показати ще раз цю довідку"
 
-#: src/main.cpp:45
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : показати ще раз цю довідку"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : файл, з �кого необхідно завантажити налаштуванн�"
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -P --password : зареє�трувати�� на �ервері зі вказаним паролем"
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : зареє�трувати�� на �ервері зі вказаним паролем"
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -P --password : зареє�трувати�� на �ервері зі вказаним паролем"
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -P --password : зареє�трувати�� на �ервері зі вказаним паролем"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : �ервер, з �кого необхідно завантажити оновленн�"
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -H --update-host : �ервер, з �кого необхідно завантажити оновленн�"
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : тека, з �кої необхідно завантажити данні"
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir : тека, котру необхідно вживати �к домашню"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : файл, з �кого необхідно завантажити налаштуванн�"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir : тека, котру необхідно вживати �к домашню"
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
 msgid "You Died"
 msgstr "Ти віддаєш: %s."
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 #, fuzzy
 msgid "Character's name already exists."
 msgstr "Отримано запрошенн� до групи, але одне вже є."
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
 msgid "Character's stats are too high."
 msgstr "Характери�тики пер�онажа в нормі"
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 #, fuzzy
 msgid "Character's stats are too low."
 msgstr "Характери�тики пер�онажа в нормі"
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2689,95 +2580,95 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Чорт зна �ка команда"
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Вкажіть кількі�ть предметів"
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Чорт зна �ка команда"
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 #, fuzzy
 msgid "Players in this channel:"
 msgstr "Гравець вдарив Тварюку"
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 #, fuzzy
 msgid "Error joining channel."
 msgstr "Команда: /join <_канал_>"
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 #, fuzzy
 msgid "Listing channels."
 msgstr "Вимагаєть�� приєднанн� до каналу %s."
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "Чорт зна �ка команда"
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2859,11 +2750,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2873,190 +2764,137 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr "Відхилено запрошенн� від %s."
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Сила"
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Спритні�ть"
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Вправні�ть"
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Витривалі�ть"
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Інтелект"
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "Шепіт"
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "�е можна над�илати порожні повідомленн�!"
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Чорт зна �ка команда"
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Гравець"
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -3070,73 +2908,118 @@ msgstr "�азва"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Сила"
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Спритні�ть"
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Витривалі�ть"
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Інтелект"
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Вправні�ть"
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Талан"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Захи�т:"
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Маг. напад:"
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Маг. захи�т:"
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "Точні�ть (%):"
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "Ухил�нн� (%):"
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Критичний удар"
@@ -3185,27 +3068,27 @@ msgstr "Ц� команда в�тановлює тему каналу"
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3281,15 +3164,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3297,15 +3180,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3313,15 +3196,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3380,7 +3263,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3388,242 +3271,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
-#, fuzzy, c-format
-msgid "Invited user %s to party."
-msgstr "/party > Запро�ити гравц� до групи"
-
-#: src/net/tmwa/partyhandler.cpp:340
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Ти отримуєш: %s."
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3639,53 +3517,44 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 #, fuzzy
 msgid "Completely ignore"
 msgstr "@@ignore|Повні�тю ігнорувати %s@@"
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
@@ -3736,6 +3605,24 @@ msgstr ""
 #~ msgid "Hyperlink"
 #~ msgstr "По�иланн�"
 
+#~ msgid "Being"
+#~ msgstr "І�тота"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Імена інших гравців"
+
+#~ msgid "Own Name"
+#~ msgstr "Вла�не ім'�"
+
+#~ msgid "GM Names"
+#~ msgstr "Імена GM"
+
+#~ msgid "NPCs"
+#~ msgstr "NPC"
+
+#~ msgid "Monsters"
+#~ msgstr "Тварюки"
+
 #~ msgid "Unknown Item Type"
 #~ msgstr "�евідомий тип предмета"
 
@@ -3780,6 +3667,29 @@ msgstr ""
 #~ msgid "Ammo"
 #~ msgstr "Боєприпа�и"
 
+#~ msgid "Particle Effects"
+#~ msgstr "Ефекти ча�ток"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Повідомленн� про підбиранн�"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Повідомленн� про зміну до�віду"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Гравець вдарив Тварюку"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Тварюка вдарила гравц�"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Критичний удар"
+
+#~ msgid "Misses"
+#~ msgstr "Промах"
+
 #~ msgid "HP Bar"
 #~ msgstr "Р�док HP"
 
@@ -3792,6 +3702,22 @@ msgstr ""
 #~ msgid "1/4 HP Bar"
 #~ msgstr "1/4 здоров'�"
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Кошти: %d"
+
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Профе�і�:"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Рівень: %d"
+
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Шепіт"
+
 #~ msgid "no"
 #~ msgstr "ні"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cb5d9b0b..26bae705 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-01-05 23:49+0000\n"
 "Last-Translator: luojie-dune <Unknown>\n"
 "Language-Team: Chinese Simplified <themanaworld-devel@lists.sourceforge."
@@ -24,488 +24,465 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "正在连接 地图 �务器..."
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "登录"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "选择角色"
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "正在连接 地图 �务器..."
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "�务器"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "密�："
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "改�"
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "会员晋��功。"
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "注销"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机： "
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误�"
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "未知命令。"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- 帮助 --"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > 显示此帮助"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > 显示地图�"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > 显示在线用户数"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > 自我介�"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > 清除此窗�"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > ���人信�给用户"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > msg的别�"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > msg的别�"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > 为和其他用户之间的�密信�开�一个新的标签页"
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > query的别�"
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > 显示所有公共频�"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > 加入或者创建一个新的频�"
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > 创建一个新的帮会"
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "邀请一个用户加入队�"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > 开始记录�天至外部文件"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > 确定<回车>键是�切��天日志"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > 获�列席的玩家列表（若开�logging，则��到�天日志）"
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > 全局通告（�GM使用）"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "输入 /help <命令>，获�更多信�。"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "命令： /help"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "该命令�显示所有�用命令。"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "命令： /help <命令>"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "该命令显现<命令>的帮助信�"
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "命令： /announce <信�>"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** �有GM�用 ***"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "该命令会��<信�>给所有在线用户。"
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "命令： /clear"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "该命令�清除历��天记录。"
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "命令：/item <策略>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "该�命令�显现当�在线用户总数。"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "命令：/join <频�>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "该命令让您进入<频�>。"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "如果<频�>�存在，自动创建。"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "命令：/list"
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "改命令列出所有频�列表。"
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "命令：/me <信�>"
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "该命令告诉别人你正在（�）<信�>。"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "命令：/msg <昵称><信�>"
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "命令：/whisper <昵称><信�>"
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "命令：/w <昵称><信�>"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "该命令��文本<信�>给<昵称>。"
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<昵称>之间有空格，用�引�(\")括起�。"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "命令：/query <昵称>"
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "命令：/q <昵称>"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "该命令�试为您和<昵称>之间的密语开�一个新的标签。"
 
-#: src/commandhandler.cpp:270
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "命令：/w <昵称><信�>"
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-#, fuzzy
-msgid "Command: /away"
-msgstr "命令： /who"
-
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "该命令设置主题为<讯�>"
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "命令：/create <帮会�>"
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "这些命令创建一个被称为<帮会�>的新帮会。"
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "命令：/party <昵称>"
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "该命令邀请<昵称>和你�会。"
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "命令： /present"
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr "该命令得到列席的玩家��并传�到记录日志如果记录，�则�天记录。"
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "命令： /record <文件�>"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "该命令开始记录�天日志至文件<文件�>。"
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "命令: /record"
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "此命令结�将此会�记录"
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "命令: /toggle <状�>"
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr "该命令设置回车键是�切��天日志，或者�天日志功能是�自动关闭。"
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr "<状�> �用“1��“yes��“true��开�，或以“0��“no��“false�关闭。"
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "命令: /toggle"
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "该命令显示<回车>键切�状�"
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "命令：/item <策略>"
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "命令: /where"
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "该�命令显示当�地图�。"
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "命令： /who"
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "该�命令�显现当�在线用户总数。"
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "输入 /help 获�命令列表。"
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "无法��空白密语�"
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr "无法� \"%s\" 建立一个�人谈�标签页�或者已�存在，或者那就是自己。"
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "请求加入频�%s。"
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "帮会�称缺失。"
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "讯�关闭�天。"
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "<回车>键现在切��天。"
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "讯�现在关闭�天。"
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "帮会创建�功。"
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "密语无法��，你已被用户忽略。"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "密语无法��，你已被用户忽略。"
@@ -515,42 +492,42 @@ msgstr "密语无法��，你已被用户忽略。"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "�幕快照�存至 ~/"
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "�存�幕快照失败�"
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "与�务器连接丢失,程�将会退出."
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "接�传入的交易请求"
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "无法加载地图"
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -564,34 +541,34 @@ msgstr "帮会（%s）"
 msgid "Buy"
 msgstr "è´­ä¹°"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "最大"
 
@@ -605,11 +582,11 @@ msgstr "出售"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "�消"
@@ -685,14 +662,14 @@ msgstr "创建角色"
 msgid "Name:"
 msgstr "姓�"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -709,8 +686,8 @@ msgstr "�色："
 msgid "Hair style:"
 msgstr "�型："
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "建立"
 
@@ -766,8 +743,8 @@ msgstr "注销"
 msgid "Change Email"
 msgstr "更�Email地�"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "删除"
 
@@ -776,24 +753,24 @@ msgstr "删除"
 msgid "Choose"
 msgstr "关闭"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "�天"
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d 玩家出席。"
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -859,8 +836,8 @@ msgstr "环境音效"
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "�下装备"
 
@@ -868,7 +845,7 @@ msgstr "�下装备"
 msgid "Help"
 msgstr "帮助"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "关闭"
 
@@ -880,81 +857,84 @@ msgstr "物��"
 msgid "Storage"
 msgstr "仓库"
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr "槽："
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "丢弃"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "分离"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "��："
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr "�回"
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "丢弃"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "确定"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物�数�。"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物�数�。"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "请选择存储的物�数�。"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "请选择�回的物�数�。"
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物�的数�"
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "��： "
@@ -986,40 +966,40 @@ msgstr "物�共享关闭。"
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "地图"
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "等待�务器中"
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "下一个"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "�交"
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "�置"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1034,7 +1014,7 @@ msgstr "至："
 msgid "Send"
 msgstr "��"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "��信件失败或者信件无效。"
 
@@ -1124,7 +1104,7 @@ msgstr "@@name|添加姓�至�天@@"
 msgid "Pick up %s"
 msgstr "�起"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|添加到�天@@"
@@ -1197,61 +1177,61 @@ msgstr "密��能少于%d个字符。"
 msgid "Passwords do not match."
 msgstr "密��一致."
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "选择你的�务器"
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "�务器："
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "端�："
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "�务器："
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "连接中..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "自定义鼠标"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "请输入�务器的IP地�和端�"
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "等待�务器中"
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1289,54 +1269,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "这就是该色彩看起�的样�"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "颜色"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "类型： "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "�止的"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "脉冲"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "色谱"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "显示： "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "红： "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "绿： "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "�： "
@@ -1422,28 +1402,33 @@ msgstr "忽略"
 msgid "???"
 msgstr "？？？"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "�许交易"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "�许密语"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "将所有密语放于标签夜"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "显示姓�"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "无法出售."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "当忽略时："
 
@@ -1499,512 +1484,479 @@ msgstr "中"
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "全�"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "��姓�"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "粒�效果"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "显示姓�"
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "显示拾起通知"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "�天中"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "作为�射武器"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS�制："
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "视频"
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 #, fuzzy
 msgid "Show damage"
 msgstr "显示姓�"
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "头顶文字"
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Gui �明度"
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "环境音效"
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "纹�细节"
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "字体大�"
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "�"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "切�到全�"
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "��生效"
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "改��OpenGL"
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "�用改�为OpenGL需��新开始"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 #, fuzzy
 msgid "Transparency disabled"
 msgstr "�验共享关闭。"
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "分辨率已�更"
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "��您的游�客户端以使�更生效。"
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "粒�效果设置已�更。"
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "�更会在地图更�时生效。"
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "�级"
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "技能点数：%d"
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "技能点数：%d"
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "等级：%d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "等级：%d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "帮会已创建"
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "确定退出游�？"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "邀请一个用户加入队�"
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "邀请一个用户加入队�"
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "确定退出游�？"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "创建角色"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "邀请用户"
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "大"
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "接�%s的邀请。"
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒�%s的邀请。"
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "接�%s的邀请。"
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒�%s的邀请。"
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "帮会"
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "选择你的�务器"
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "接�到一个已�存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s已�邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "接�帮会邀请"
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "接�到一个已�存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s已�邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s已�邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已�邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已�邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "接�帮会邀请"
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "帮会"
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "选择你的�务器"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "金�: %s"
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP："
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "�验："
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP："
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "�业：%d"
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "�业："
 
-#: src/gui/statuswindow.cpp:203
-#, fuzzy
-msgid "HP"
-msgstr "HP："
-
-#: src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "MP："
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "�验："
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "金钱：%d"
-
-#: src/gui/statuswindow.cpp:234
-#, fuzzy
-msgid "Job"
-msgstr "�业："
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "角色状��以"
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "技能点数：%d"
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "等级：%d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "打算交易"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "已确认。等待中……"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "��交易"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "已��。等待中……"
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "交易：你"
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "添加"
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "你得到%s。"
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "你给予："
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "改�"
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物�失败。你�能覆盖窗�中的该类物�。"
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "你没有足够的钱�."
 
@@ -2044,86 +1996,6 @@ msgstr "##1 您�候�次�试"
 msgid "Completed"
 msgstr "已完�"
 
-# need more contents!!!
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "存在"
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "其他玩家�"
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "自己的�字"
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "GM�"
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "NPCs"
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "怪物"
-
-#: src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "帮会"
-
-#: src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "帮会"
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "粒�效果"
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "拾起通知"
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "到期通知"
-
-#: src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "玩家攻击怪兽"
-
-#: src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "怪兽击打玩家"
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "会心一击"
-
-#: src/gui/userpalette.cpp:107
-#, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "玩家攻击怪兽"
-
-#: src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "会心一击"
-
-#: src/gui/userpalette.cpp:111
-#, fuzzy
-msgid "Local Player Miss"
-msgstr "�存玩家列表"
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "失误"
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/usr > 列出当�频�的用户"
@@ -2200,55 +2072,55 @@ msgstr "需�一个用户��作"
 msgid "Need a user to kick!"
 msgstr "踢人时需�指定用户�"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "全局公告："
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 全局公告："
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s悄悄的对您说： "
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "无法��空白信��"
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > 关闭密语标签页"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "命令: /close"
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "该命令关闭当�密语标签页。"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "命令：/item"
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "该�命令�显现当�在线用户总数。"
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "该命令开始记录�天日志至文件<文件�>。"
@@ -2276,412 +2148,426 @@ msgstr "改�"
 msgid "Choose World"
 msgstr "选择你的�务器"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "�上移动"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "�下移动"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "�左移动"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "��移动"
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "攻击"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "对准并攻击"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "笑脸"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "说�"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "�止攻击"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "对准最近目标"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "目标NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "目标玩家"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "�起"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "��窗�"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "�下"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "�幕快照"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "开�/关闭交易"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物�快� %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "帮助窗�"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "状�窗�"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "物��窗�"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "装备窗�"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "技能窗�"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "�地图窗�"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "�天窗�"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "物�快�窗�"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "设置窗�"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Debug窗�"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "技能窗�"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "表情快�窗�"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "状�窗�"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情快�键为 %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "切��天"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "�上滚动�天记录"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "�下滚动�天记录"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "上一个�天窗�标签页"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "下一个�天窗�标签页"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "选择OK"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "忽略输入1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "忽略输入2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "解决按键冲�，�者游�过程中�能�生奇怪行为。"
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "无法拾�物�。"
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你�起%s [@@%d|%s@@]。"
 msgstr[1] "你�起%s [@@%d|%s@@]。"
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "选项："
 
-#: src/main.cpp:44
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version\t:显示版本�"
 
-#: src/main.cpp:45
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help\t: 显示该帮助"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file\t: 使用的�置文件"
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username\t:以该用户�登录游�"
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password\t: 以该密�登录"
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character\t: 以该角色登录"
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server\t: 登录�务器�或IP"
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port\t: 登录�务器端�"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host\t: 使用该更新主机"
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default\t: 选择�人角色�务器和角色"
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update\t:跳过下载更新"
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data\t: 从此目录加载游�数�"
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir\t: 用该目录作为家目录"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file\t: 使用的�置文件"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir\t: 用该目录作为家目录"
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl\t:为该次会�关闭OpenGL"
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr "你已玩完了。"
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "很�憾的告诉您，您的角色在战斗中死亡了"
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr "你�也�是那样的生机勃勃了。"
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr "游�结��"
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "�，孩�。你的角色没有真正死亡。他……呃……�过是去了一个更好的地方而已。"
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr "被消�了。"
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 #, fuzzy
 msgid "Press OK to respawn."
 msgstr " 按OK�新开始"
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
 msgid "You Died"
 msgstr "你完蛋了"
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Not logged in."
 msgstr "已�登录"
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 #, fuzzy
 msgid "Character's name already exists."
 msgstr "用户�已存在"
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
 msgid "Character's stats are too high."
 msgstr "角色状��以"
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 #, fuzzy
 msgid "Character's stats are too low."
 msgstr "角色状��以"
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2689,96 +2575,96 @@ msgstr ""
 msgid "Unknown error."
 msgstr "未明错误"
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr "信�"
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 #, fuzzy
 msgid "Player deleted."
 msgstr "角色已删除。"
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "请选择交易的物�数�。"
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "未明错误"
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr "无 游��务器 �用。"
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr "主题：%s"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 #, fuzzy
 msgid "Players in this channel:"
 msgstr "玩家攻击怪兽"
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 #, fuzzy
 msgid "Error joining channel."
 msgstr "命令：/join <频�>"
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 #, fuzzy
 msgid "Listing channels."
 msgstr "请求加入频�%s。"
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, fuzzy, c-format
 msgid "%s entered the channel."
 msgstr "%s加入了帮会。"
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "未知命令。"
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr "帮会已创建"
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr "邀请已��。"
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr "会员晋��功。"
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr "晋�会员失败。"
 
@@ -2869,11 +2755,11 @@ msgstr "电�邮件地�已存在"
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr "加入了帮会。"
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr "%s加入了帮会。"
@@ -2883,190 +2769,137 @@ msgstr "%s加入了帮会。"
 msgid "%s rejected your invite."
 msgstr "%s拒�了您的邀请。"
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "力�"
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "力� %+d"
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "��"
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "�� %+d"
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "��"
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr "�� %+d"
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "生命"
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr "生命 %+d"
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "智慧"
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr "智慧 %+d"
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "�志力："
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "�志力 %+d"
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr "正在接�交易请求"
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr "忽略交易请求"
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s想和您进行交易，是�接�？"
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr "与%s交易中"
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr "交易�消。"
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr "交易完�。"
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "踢出失败�"
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "�功踢出�"
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "无物�供出售。"
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "谢谢你的购买。"
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "无法购买。"
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "感谢您的出售。"
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "无法出售."
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "�能使用该ID"
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "未明错误"
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "创建角色失败。很�能�称已被�用。"
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "角色已删除。"
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "删除角色失败。"
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "力�："
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "��："
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "生命："
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "智力："
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "�巧："
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "幸�："
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "密语无法��，用户已离线。"
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "密语无法��，你已被用户忽略。"
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "玩家"
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "�天频��被支��"
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -3081,80 +2914,125 @@ msgstr "姓�"
 msgid "Request to quit denied!"
 msgstr "请求交易"
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr "力� %+d"
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr "�� %+d"
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr "生命 %+d"
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr "智慧 %+d"
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr "�� %+d"
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr "幸� %+d"
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "验�失败"
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "无�用�务器"
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "�人正在�试使用该��"
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "该��已�登录"
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "检测到调速作弊"
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "��登录"
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "未知连接错误"
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "和�务器失去连接"
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "力�"
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "��"
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "生命"
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "智慧"
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "��"
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "幸�"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "防御："
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "魔攻："
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "魔防："
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Ac精确度："
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% E回�率："
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "会心一击"
@@ -3205,29 +3083,29 @@ msgstr "该命令致使玩家离开帮会"
 msgid "Guild name is missing."
 msgstr "帮会�称缺失。"
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s现在是你帮会中的�员了。"
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "未知邀请应答%s。"
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3307,15 +3185,15 @@ msgstr "命令：/exp"
 msgid "This command displays the party's current experience sharing policy."
 msgstr "该命令显示帮会现有的�验共享策略。"
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "物�共享开�。"
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "物�共享关闭。"
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "物�共享��能。"
 
@@ -3324,15 +3202,15 @@ msgstr "物�共享��能。"
 msgid "Item sharing unknown."
 msgstr "物�共享开�。"
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "�验共享开�。"
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "�验共享关闭。"
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "�验共享��能。"
 
@@ -3341,15 +3219,15 @@ msgstr "�验共享��能。"
 msgid "Experience sharing unknown."
 msgstr "�验共享开�。"
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "使用物�失败。"
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "无法装备。"
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "无法�载装备。"
 
@@ -3416,7 +3294,7 @@ msgstr "无法出售."
 msgid "Connection to server terminated. "
 msgstr "正在连接 地图 �务器..."
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "无法创建帮会。"
 
@@ -3424,244 +3302,239 @@ msgstr "无法创建帮会。"
 msgid "Party successfully created."
 msgstr "帮会创建�功。"
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s已�是你的帮会�员了。"
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s拒�了您的邀请。"
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s现在是你帮会中的�员了。"
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "未知邀请应答%s。"
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "你以退出帮会"
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s已�离开你的帮会。"
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "一未知�员�试说：%s"
 
 #: src/net/tmwa/partyhandler.cpp:335
-#, fuzzy, c-format
-msgid "Invited user %s to party."
-msgstr "邀请一个用户加入队�"
-
-#: src/net/tmwa/partyhandler.cpp:340
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s�在你的帮会中�"
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "投入游��继续。"
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "你还没死，你�是在休�"
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 "<策略>�以为“1�，“yes�，“true�其中之一以开�物�共享，或者 是\"0\",\"no\","
 "\"false\"用��止物�共享。"
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "讯�"
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已�带超过�数负�。无法回��康（体力）"
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "你�起 "
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "请先装备弓箭。"
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "交易失败�"
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "��表情失败�"
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "原地休�失败�"
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "�天创建失败�"
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "�能加入工会�"
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "无法呼喊�"
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级�"
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "HP�足�"
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "SP�足�"
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "没有备忘录"
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "你无法办到�"
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "看起�需�更多金�…… ;-)"
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用�使用此项技能�"
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "你需��一颗红�石�"
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "你需��一颗��石�"
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "你已负�太多，无法办到�"
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "啊？那是什么？"
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "传�失败..."
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "无法��任何物�..."
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "毒�无效..."
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "交易��能进行。与交易伙伴太过太过�远"
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "交易��能进行。角色�存在。"
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "交易�消因�明原因。"
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "交易：您和%s"
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "与%s的交易被�消。"
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "未处�的交易�消分组。"
 
@@ -3677,53 +3550,44 @@ msgstr "添加项目失败。交易伙伴无空闲槽存放物�。"
 msgid "Failed adding item for unknown reason."
 msgstr "添加项目失败，原因未知。"
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 #, fuzzy
 msgid "Completely ignore"
 msgstr "@@ignore|完全忽略%s@@"
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr "攻击 %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr "防护 %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr "未知物�"
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr "未知怪兽"
 
@@ -3774,6 +3638,25 @@ msgstr "未知怪兽"
 #~ msgid "Hyperlink"
 #~ msgstr "超链接"
 
+# need more contents!!!
+#~ msgid "Being"
+#~ msgstr "存在"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "其他玩家�"
+
+#~ msgid "Own Name"
+#~ msgstr "自己的�字"
+
+#~ msgid "GM Names"
+#~ msgstr "GM�"
+
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
+
+#~ msgid "Monsters"
+#~ msgstr "怪物"
+
 #~ msgid "Unknown Item Type"
 #~ msgstr "未知物�类型"
 
@@ -3818,6 +3701,29 @@ msgstr "未知怪兽"
 #~ msgid "Ammo"
 #~ msgstr "弹�"
 
+#~ msgid "Particle Effects"
+#~ msgstr "粒�效果"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "拾起通知"
+
+#~ msgid "Exp Notification"
+#~ msgstr "到期通知"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "玩家攻击怪兽"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "怪兽击打玩家"
+
+#~ msgid "Critical Hit"
+#~ msgstr "会心一击"
+
+#~ msgid "Misses"
+#~ msgstr "失误"
+
 #~ msgid "HP Bar"
 #~ msgstr "HP�"
 
@@ -3831,6 +3737,30 @@ msgstr "未知怪兽"
 #~ msgstr "1/4 HP�"
 
 #, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP："
+
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP："
+
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "�验："
+
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "金钱：%d"
+
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "�业："
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "等级：%d"
+
+#, fuzzy
 #~ msgid "Access denied."
 #~ msgstr "访问被拒�"
 
@@ -3844,6 +3774,13 @@ msgstr "未知怪兽"
 #~ msgid "Willpower:"
 #~ msgstr "�志力："
 
+#~ msgid "Willpower %+d"
+#~ msgstr "�志力 %+d"
+
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "�志力："
+
 #, fuzzy
 #~ msgid "Server is full."
 #~ msgstr "�务器满载"
@@ -4065,6 +4002,9 @@ msgstr "未知怪兽"
 #~ msgid "@@pickup|Pick Up %s@@"
 #~ msgstr "@@�起|�起%s@@"
 
+#~ msgid "Save player list"
+#~ msgstr "�存玩家列表"
+
 #~ msgid "Scroll laziness"
 #~ msgstr "Scroll laziness"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index b340dd6d..70ba64d5 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-06-08 22:11+0000\n"
 "Last-Translator: lok0919 <lok0919@gmail.com>\n"
 "Language-Team: Traditional Chinese <themanaworld-devel@lists.sourceforge."
@@ -24,485 +24,462 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "正在連接到地圖伺�器..."
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "登入"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "�擇角色"
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "正在連接到地圖伺�器..."
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "更改"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "密碼："
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "更改"
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "註冊"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "�明指令"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- 說明 --"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > 顯示地圖�稱"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > 顯示線上人數"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > 告訴一些有關你的事"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > 清除此窗�"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > 發��人訊�給玩家"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > 等�msg"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > 等�msg"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > 等�query"
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > 顯示所有公共頻�"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > 加入/建立一個頻�"
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/party > 邀請玩家加入隊�"
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > 邀請玩家加入隊�"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > 開始錄製�天至外部文件"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > ���在的玩家�單（如果錄製�天中，會發�到�天記錄）"
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > 公告 (GM only)"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "指令： /help"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "該指令�顯示所有�用指令。"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "指令： /help <指令>"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "該指令會顯示<指令>的幫助訊�"
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "指令： /announce <信�>"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** �有GM�用 ***"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "該指令會發�<信�>給所有線上用戶。"
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "指令： /clear"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "該指令�以清除�天紀錄。"
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "/join <頻�>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "這調指令�顯示目�線上人數。"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "/join <頻�>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "這個指令令你進入 <頻�>."
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "如果<頻�>�存在，將會被建立"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "這個指令會列出所有頻�"
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "/me <信�>"
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "這個指令會告訴其他人你正在 <信�>."
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:270
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "指令： /clear"
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-#, fuzzy
-msgid "Command: /away"
-msgstr "指令： /who"
-
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "該指令�以清除�天紀錄。"
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "指令： /clear"
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "這個指令令你進入 <頻�>."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "指令： /announce <信�>"
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "指令: /where"
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "這個指令顯示目�地圖�。"
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "指令： /who"
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "這調指令�顯示目�線上人數。"
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "輸入 /help ��指令列表。"
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -511,41 +488,41 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "正在連接角色伺�器..."
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "�能加入隊��"
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -559,34 +536,34 @@ msgstr ""
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "離開"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -600,11 +577,11 @@ msgstr "出售"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "�消"
@@ -677,14 +654,14 @@ msgstr "新增角色"
 msgid "Name:"
 msgstr "�字："
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -701,8 +678,8 @@ msgstr "�色："
 msgid "Hair style:"
 msgstr "髮型："
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "創造"
 
@@ -758,8 +735,8 @@ msgstr "註冊"
 msgid "Change Email"
 msgstr "更改"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "刪除"
 
@@ -768,24 +745,24 @@ msgstr "刪除"
 msgid "Choose"
 msgstr "關閉"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "�%s竊竊�語：%s"
@@ -851,8 +828,8 @@ msgstr ""
 msgid "Equipment"
 msgstr "�備"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "�下�備"
 
@@ -860,7 +837,7 @@ msgstr "�下�備"
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "關閉"
 
@@ -872,81 +849,84 @@ msgstr "物�攔"
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "�備"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "丟棄"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "丟棄"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "確定"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "請�擇交易的物�數�"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "請�擇丟棄的物�數�"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "請�擇你�分離的物�數�"
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "效果：%s"
@@ -977,40 +957,40 @@ msgstr ""
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "下一個"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1025,7 +1005,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -1112,7 +1092,7 @@ msgstr ""
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
@@ -1184,60 +1164,60 @@ msgstr "密碼�能少於%d個字元。"
 msgid "Passwords do not match."
 msgstr "密碼�一樣."
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "伺�器："
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port："
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "伺�器："
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "連線中..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "自訂滑鼠標"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "請輸入伺�氣得IP地�和Port"
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "正在連接到地圖伺�器..."
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1274,51 +1254,51 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "開始"
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1403,27 +1383,31 @@ msgstr "忽略"
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "�許交易"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "�許密語"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "當忽略時："
 
@@ -1479,494 +1463,464 @@ msgstr "中"
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS�制："
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "顯示"
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Gui �明度"
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "紋�細節"
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "�"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "切�全螢幕"
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "請�新啟動"
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "切�為OpenGL"
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "確�切�OpenGL需��新開始"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "�級"
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "技能點數：%d"
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "技能點數：%d"
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "等級：%d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "等級：%d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > 邀請玩家加入隊�"
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > 邀請玩家加入隊�"
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "新增角色"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "�業：%d"
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "金錢：%d"
-
-#: src/gui/statuswindow.cpp:234
-#, fuzzy
-msgid "Job"
-msgstr "�業：%d"
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "角色狀態確定"
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "技能點數：%d"
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "等級：%d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "是�交易"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "增加"
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "你付出:"
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物�失敗。你�能覆蓋視窗中的該類物�能。"
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2005,79 +1959,6 @@ msgstr ""
 msgid "Completed"
 msgstr "已完�"
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr ""
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr ""
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr ""
-
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr ""
-
-#: src/gui/userpalette.cpp:111
-#, fuzzy
-msgid "Local Player Miss"
-msgstr "�存玩家列表"
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -2154,55 +2035,55 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "主�公告："
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 主�公告："
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "�%s竊竊�語：%s"
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "指令: /where"
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "這調指令�顯示目�線上人數。"
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2228,392 +2109,405 @@ msgstr "更改"
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "解決按���，�則�戲中�能�到奇怪行為。"
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
-msgid "Options:"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:44
-msgid "  -v --version        : Display the version"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/help > 顯示幫助"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
 msgid "You Died"
 msgstr "你付出:"
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
 msgid "Character's stats are too high."
 msgstr "角色狀態確定"
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 #, fuzzy
 msgid "Character's stats are too low."
 msgstr "角色狀態確定"
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2621,93 +2515,93 @@ msgstr ""
 msgid "Unknown error."
 msgstr "�明指令"
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "請�擇交易的物�數�"
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "�明指令"
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 #, fuzzy
 msgid "Error joining channel."
 msgstr "/join <頻�>"
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "�明指令"
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
@@ -2784,11 +2678,11 @@ msgstr ""
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
@@ -2798,189 +2692,136 @@ msgstr ""
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "力�"
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "��"
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "閃躲"
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "體力"
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "智力"
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr ""
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "�志力:"
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "�明指令"
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "玩家"
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -2994,74 +2835,119 @@ msgstr "�字"
 msgid "Request to quit denied!"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "�天新增失敗�"
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "和伺�器失去連線"
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "力�"
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "��"
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "體力"
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "智力"
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "閃躲"
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "幸�"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "防禦："
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "摩攻："
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "魔防："
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Ac準確度："
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% E迴�率："
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
@@ -3109,27 +2995,27 @@ msgstr "這個指令顯示目�地圖�。"
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3205,15 +3091,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3221,15 +3107,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -3237,15 +3123,15 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
@@ -3304,7 +3190,7 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr "正在連接到地圖伺�器..."
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3312,242 +3198,237 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:335
-#, fuzzy, c-format
-msgid "Invited user %s to party."
-msgstr "/party > 邀請玩家加入隊�"
-
-#: src/net/tmwa/partyhandler.cpp:340
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "交易失敗�"
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "顯示表情失敗�"
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "�下休�失敗�"
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "�天新增失敗�"
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "�能加入隊��"
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "無法大��"
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你還沒�到足夠等級�"
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "HP�夠�"
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "SP�夠�"
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "沒有備忘錄"
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器無法使用此技能�"
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "你需��一顆紅寶石!"
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "你需��一棵�寶石!"
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "你已負�太多，�能�多!"
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "阿?那是甚麼?"
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "傳�失敗..."
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "無法��任何物�..."
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "藥水無效..."
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3563,59 +3444,66 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 #, fuzzy
 msgid "Completely ignore"
 msgstr "已完�"
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "金錢：%d"
+
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "�業：%d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "等級：%d"
+
 #~ msgid "Willpower:"
 #~ msgstr "�志力:"
 
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "�志力:"
+
 #~ msgid "Description: %s"
 #~ msgstr "說明：%s"
 
@@ -3676,6 +3564,9 @@ msgstr ""
 #~ msgid "Unnamed"
 #~ msgstr "未知物�"
 
+#~ msgid "Save player list"
+#~ msgstr "�存玩家列表"
+
 #~ msgid "Scroll radius"
 #~ msgstr "�動�徑"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 04447553..3de50504 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-01-23 17:23+0000\n"
 "Last-Translator: Peierh <Unknown>\n"
 "Language-Team: Traditional Chinese <themanaworld-devel@lists.sourceforge."
@@ -24,375 +24,352 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:643
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "正在連接到地圖伺�器..."
 
-#: src/client.cpp:670
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "登入"
 
-#: src/client.cpp:703
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:762
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "�擇角色"
 
-#: src/client.cpp:791
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "正在連接到地圖伺�器..."
 
-#: src/client.cpp:801
+#: src/client.cpp:843
 #, fuzzy
 msgid "Changing game servers"
 msgstr "伺�器"
 
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:846
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "密碼："
 
-#: src/client.cpp:874
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:893
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "更改"
 
-#: src/client.cpp:894
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "�功��會員."
 
-#: src/client.cpp:914
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "�消註冊"
 
-#: src/client.cpp:915
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "無效的更新主機: "
 
-#: src/client.cpp:1266 src/client.cpp:1272
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "建立更新目錄失敗�"
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "�明指令"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- 說明 --"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help >顯示指令說明"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > 顯示地圖�稱"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > 顯示線上使用者的數�"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > 顯示關於自己的資訊"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > 清除這個視窗"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > 傳��人訊�給�使用者"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > 效果� msg"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > 效果� msg"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > 建立與�一個使用者的�人訊�分�"
 
-#: src/commandhandler.cpp:179
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > 效果� query"
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > 顯示所有公開頻�"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > 加入或建立頻�"
 
-#: src/commandhandler.cpp:190
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > 建立新的隊�"
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > 邀請使用者組隊"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > 開始紀錄�話內容到外部檔案"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > 是�切�回�天視窗"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > �得上線玩家的清單（如果開啟記錄，傳�到�天紀錄）"
 
-#: src/commandhandler.cpp:200
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > 全域廣播 (GM 專用)"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "查看更多資訊, 輸入 /help <指令>."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "指令： /help"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "該指令�顯示所有�用指令。"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "指令： /help <指令>"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "該指令會顯示<指令>的幫助訊�"
 
-#: src/commandhandler.cpp:220
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "指令： /announce <信�>"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** �有GM�用 ***"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "該指令會發�<信�>給所有線上用戶。"
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "指令： /clear"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "該指令�以清除�天紀錄。"
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "/item <政策>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "這調指令�顯示目�線上人數。"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "指令: /join <頻��稱>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "這個指令�以讓你輸入 <頻��稱>."
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "�如 <頻��稱> �存在,那就建立."
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "指令： /list"
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "這個指令會顯示所有頻�的清單。"
 
-#: src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "指令： /me <message>"
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "這個指令會告訴其他人您正在� <msg> 的事。"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "指令： /msg <nick> <message>"
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "指令： /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "指令： /w <nick> <message>"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "這個指令會傳� <message> 的文字給 <nick>。"
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "指令： /query <nick>"
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "指令： /q <nick>"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "這個指令會嘗試建立您和 <nick> 之間的悄悄話分�。"
 
-#: src/commandhandler.cpp:270
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "指令： /w <暱稱> <信�>"
-
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:273
-#, fuzzy
-msgid "Command: /away"
-msgstr "指令： /who"
-
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "這個指令會將主題設定為 <message>。"
-
-#: src/commandhandler.cpp:278
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "指令： /create <隊��稱>"
 
-#: src/commandhandler.cpp:279
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "這些指令會建立�� <隊��稱> 的新隊�。"
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "指令： /party <nick>"
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "這個指令會邀請 <nick> 跟您組隊。"
 
-#: src/commandhandler.cpp:290
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "指令： /present"
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 "該指令顯示玩家有�到並傳�到任何日誌記錄，如果記錄，�天記錄或其他方�。"
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "指令： /record <filename>"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "這個指令會開始將�天紀錄錄製為檔案 <filename>。"
 
-#: src/commandhandler.cpp:300
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "指令： /record"
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "這個指令會��錄製的作業階段。"
 
-#: src/commandhandler.cpp:305
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "指令： /toggle <state>"
 
-#: src/commandhandler.cpp:306
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr "這指令用來設定\"enter\"�是�切��天記錄,或者自動關閉記錄"
 
-#: src/commandhandler.cpp:308
+#: src/commandhandler.cpp:292
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -400,115 +377,115 @@ msgstr ""
 "�以是 \"1\"�\"yes\"�\"true\" 其中之一來代表切�為開，或是 \"0\"�\"no"
 "\"�\"false\" 來代表切�為關閉."
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "指令： /toggle"
 
-#: src/commandhandler.cpp:312
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "這個指令顯示輸入切�狀態"
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "/item <政策>"
 
-#: src/commandhandler.cpp:317
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:322
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "指令: /where"
 
-#: src/commandhandler.cpp:323
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "這個指令顯示目�地圖�。"
 
-#: src/commandhandler.cpp:327
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "指令： /who"
 
-#: src/commandhandler.cpp:328
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "這調指令�顯示目�線上人數。"
 
-#: src/commandhandler.cpp:334
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "輸入 /help ��指令列表。"
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "傳�密語失敗"
 
-#: src/commandhandler.cpp:408
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr "�能以�稱 \"%s\" 創建一個密語標籤! 該�稱已存在或�方是你."
 
-#: src/commandhandler.cpp:422
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "�求�加頻� %s"
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "�掉隊��稱。"
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "\"ENTER\"切��天"
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "關閉密語"
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "\"ENTER\"切��天"
 
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "切��天"
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:538
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "隊�已�功的建立。"
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "該玩家拒絕你的密語"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:562
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "該玩家拒絕你的密語"
@@ -518,42 +495,42 @@ msgstr "該玩家拒絕你的密語"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s 的�項�以是 \"yes\"�\"no\"�\"true\"�\"false\"�\"1\"�\"0\"。"
 
-#: src/game.cpp:169
+#: src/game.cpp:172
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:333
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "抓圖存到 ~/"
 
-#: src/game.cpp:338
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
-#: src/game.cpp:368
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "已中斷連線到伺�器,程�將�離開"
 
-#: src/game.cpp:372
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: src/game.cpp:713
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "忽略收到的交易�求"
 
-#: src/game.cpp:720
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "接�收到的交易�求"
 
-#: src/game.cpp:950
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "無法載入地圖"
 
-#: src/game.cpp:951
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "載入 %s 時發生錯誤"
@@ -567,34 +544,34 @@ msgstr "隊�(%s)"
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "價格: %s / 總共: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr "增加"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr "減少"
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "離開"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "最大"
 
@@ -608,11 +585,11 @@ msgstr "出售"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "�消"
@@ -688,14 +665,14 @@ msgstr "新增角色"
 msgid "Name:"
 msgstr "�字："
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -712,8 +689,8 @@ msgstr "髮色："
 msgid "Hair style:"
 msgstr "髮型："
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "創造"
 
@@ -769,8 +746,8 @@ msgstr "�消註冊"
 msgid "Change Email"
 msgstr "變更郵件地�"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "刪除"
 
@@ -779,24 +756,24 @@ msgstr "刪除"
 msgid "Choose"
 msgstr "關閉"
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:87
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "�天"
 
-#: src/gui/chat.cpp:307
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d �玩家的清單"
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "將上線訊�寫入錄製紀錄。"
 
-#: src/gui/chat.cpp:452
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "�%s竊竊�語：%s"
@@ -862,8 +839,8 @@ msgstr "環境效果"
 msgid "Equipment"
 msgstr "�備"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "�下�備"
 
@@ -871,7 +848,7 @@ msgstr "�下�備"
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "關閉"
 
@@ -883,81 +860,84 @@ msgstr "物�攔"
 msgid "Storage"
 msgstr "貯�庫"
 
-#: src/gui/inventorywindow.cpp:80
+#: src/gui/inventorywindow.cpp:82
 msgid "Slots:"
 msgstr "欄�:"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "�備"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "丟棄"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "��:"
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
 msgid "Store"
 msgstr "寄放"
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr "�回"
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "丟棄"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "確定"
 
-#: src/gui/itemamount.cpp:105
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "請�擇交易的物�數�"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "請�擇丟棄的物�數�"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "�擇�儲存的物�數�。"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "�擇��回的物�數�。"
 
-#: src/gui/itemamount.cpp:143
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "請�擇你�分離的物�數�"
 
-#: src/gui/itempopup.cpp:126
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "��: "
@@ -989,40 +969,40 @@ msgstr "物�分享已�用。"
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "地圖"
 
-#: src/gui/ministatus.cpp:157
+#: src/gui/ministatus.cpp:235
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "等待伺�器中"
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "下一個"
 
-#: src/gui/npcdialog.cpp:48
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "確�"
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:98
+#: src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:114
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "�設"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -1037,7 +1017,7 @@ msgstr "存至:"
 msgid "Send"
 msgstr "傳�"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "無法傳�的發件人或信�無效。"
 
@@ -1127,7 +1107,7 @@ msgstr "@@name|增加�天�單@@"
 msgid "Pick up %s"
 msgstr "撿拾"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|加入�天@@"
@@ -1200,61 +1180,61 @@ msgstr "密碼�能少於%d個字元。"
 msgid "Passwords do not match."
 msgstr "密碼�一樣."
 
-#: src/gui/serverdialog.cpp:196
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "�擇您的伺�器"
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "伺�器："
 
-#: src/gui/serverdialog.cpp:209
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "端�(port):"
 
-#: src/gui/serverdialog.cpp:211
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "伺�器："
 
-#: src/gui/serverdialog.cpp:233
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "連線中..."
 
-#: src/gui/serverdialog.cpp:234
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "自訂滑鼠標"
 
-#: src/gui/serverdialog.cpp:337
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "請輸入伺�氣得IP地�和Port"
 
-#: src/gui/serverdialog.cpp:442
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "等待伺�器中"
 
-#: src/gui/serverdialog.cpp:452
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:456
+#: src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:558
+#: src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1292,54 +1272,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "這是�色看起來的樣�"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "�色"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "é¡žåž‹: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "狀態"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "暫�"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "光譜"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "延�: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "ç´…: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "綠: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "è—�: "
@@ -1425,28 +1405,33 @@ msgstr "忽略"
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "�許交易"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "�許密語"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "將所有的悄悄話放到分�中"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "顯示�稱"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "�能出售."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "當忽略時："
 
@@ -1502,514 +1487,481 @@ msgstr "中"
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "�見的�稱"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "粒�效果"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "顯示�稱"
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "顯示撿拾通知"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "�天中"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "�粒�設定"
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS�制："
 
-#: src/gui/setup_video.cpp:249
+#: src/gui/setup_video.cpp:247
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "顯示"
 
-#: src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:252
 #, fuzzy
 msgid "Show damage"
 msgstr "顯示�稱"
 
-#: src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "置頂文字"
 
-#: src/gui/setup_video.cpp:261
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Gui �明度"
 
-#: src/gui/setup_video.cpp:262
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "環境效果"
 
-#: src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "紋�細節"
 
-#: src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "字型大�"
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "�"
 
-#: src/gui/setup_video.cpp:428
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "模�和�復舊模�也沒有�"
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "模�和�復舊模�也沒有�"
 
-#: src/gui/setup_video.cpp:445
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "切�全螢幕"
 
-#: src/gui/setup_video.cpp:446
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "請�新啟動"
 
-#: src/gui/setup_video.cpp:460
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "切�為OpenGL"
 
-#: src/gui/setup_video.cpp:461
+#: src/gui/setup_video.cpp:459
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:466
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "確�切�OpenGL需��新開始"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:475
 #, fuzzy
 msgid "Transparency disabled"
 msgstr "經驗值分享已�用。"
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "螢幕解�度已變更"
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "請�新啟動您的客戶端讓變更生效。"
 
-#: src/gui/setup_video.cpp:582
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:615
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "粒�效果設定值已變更。"
 
-#: src/gui/setup_video.cpp:616
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "變更會在地圖改變後生效。"
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:221
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "�級"
 
-#: src/gui/skilldialog.cpp:271
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "技能點數：%d"
 
-#: src/gui/skilldialog.cpp:353
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "技能點數：%d"
 
-#: src/gui/skilldialog.cpp:362
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "等級：%d"
 
-#: src/gui/skilldialog.cpp:455
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "等級：%d"
 
-#: src/gui/socialwindow.cpp:128
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:143
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "公會已�立."
 
-#: src/gui/socialwindow.cpp:157
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:158
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:167
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "建立公會"
 
-#: src/gui/socialwindow.cpp:168
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "您確定�離開?"
 
-#: src/gui/socialwindow.cpp:222
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > 邀請使用者組隊"
+
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:236
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > 邀請使用者組隊"
 
-#: src/gui/socialwindow.cpp:237
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:246
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:247
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "您確定�離開?"
 
-#: src/gui/socialwindow.cpp:276
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "建立公會"
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "新增角色"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:334
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "邀請使用者"
 
-#: src/gui/socialwindow.cpp:335
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "大型"
 
-#: src/gui/socialwindow.cpp:447
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "接� %s 的派�邀請."
 
-#: src/gui/socialwindow.cpp:453
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒絕 %s 的派�邀請"
 
-#: src/gui/socialwindow.cpp:466
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "接� %s 的派�邀請."
 
-#: src/gui/socialwindow.cpp:472
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒絕 %s 的派�邀請"
 
-#: src/gui/socialwindow.cpp:501
+#: src/gui/socialwindow.cpp:497
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "創建公會時發生錯誤."
 
-#: src/gui/socialwindow.cpp:523
+#: src/gui/socialwindow.cpp:520
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:543
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "公會"
 
-#: src/gui/socialwindow.cpp:544
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "�擇您的伺�器"
 
-#: src/gui/socialwindow.cpp:556
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "收到派�邀請,但而有�一個存在."
 
-#: src/gui/socialwindow.cpp:561
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s 邀請你�加 %s 派�."
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "接�派�邀請"
 
-#: src/gui/socialwindow.cpp:578
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "收到派�邀請,但而有�一個存在."
 
-#: src/gui/socialwindow.cpp:588
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s 邀請你�加他們的派�."
 
-#: src/gui/socialwindow.cpp:592
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s 邀請你�加 %s 派�."
 
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s 邀請你�加他們的派�."
 
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s 邀請你�加 %s 派�."
 
-#: src/gui/socialwindow.cpp:613
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "接�派�邀請"
 
-#: src/gui/socialwindow.cpp:624
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:629
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "隊�"
 
-#: src/gui/socialwindow.cpp:630
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "�擇您的伺�器"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "金錢: %s"
 
-#: src/gui/statuswindow.cpp:113
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "體力 :"
 
-#: src/gui/statuswindow.cpp:118
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "經驗值:"
 
-#: src/gui/statuswindow.cpp:123
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "魔力:"
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "�業：%d"
 
-#: src/gui/statuswindow.cpp:142
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "�業:"
 
-#: src/gui/statuswindow.cpp:203
-#, fuzzy
-msgid "HP"
-msgstr "體力 :"
-
-#: src/gui/statuswindow.cpp:209
-#, fuzzy
-msgid "MP"
-msgstr "魔力:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Exp"
-msgstr "經驗值:"
-
-#: src/gui/statuswindow.cpp:224
-#, fuzzy
-msgid "Money"
-msgstr "金錢：%d"
-
-#: src/gui/statuswindow.cpp:234
-#, fuzzy
-msgid "Job"
-msgstr "�業:"
-
-#: src/gui/statuswindow.cpp:238
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "角色狀態確定"
 
-#: src/gui/statuswindow.cpp:244
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "技能點數：%d"
 
-#: src/gui/statuswindow.cpp:257
-#, fuzzy
-msgid "Level"
-msgstr "等級：%d"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "是�交易"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "已確�。請�候..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "��交易"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "已��。請�候..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "交易：您"
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/trade.cpp:75
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "增加"
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "您得到 %s。"
 
-#: src/gui/trade.cpp:98
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/trade.cpp:102
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/trade.cpp:273
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物�失敗。你�能覆蓋視窗中的該類物�能。"
 
-#: src/gui/trade.cpp:316
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "你沒有足夠的金錢."
 
@@ -2049,85 +2001,6 @@ msgstr "##1  您�後�試一次"
 msgid "Completed"
 msgstr "已完�"
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "物件"
-
-#: src/gui/userpalette.cpp:92
-msgid "Other Players' Names"
-msgstr "其他使用者�字"
-
-#: src/gui/userpalette.cpp:93
-msgid "Own Name"
-msgstr "我的�字"
-
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "�戲管�者�字"
-
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "電腦"
-
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "怪物"
-
-#: src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "隊�"
-
-#: src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "公會"
-
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
-msgstr "粒�效果"
-
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "撿拾通知"
-
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "經驗值通知"
-
-#: src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "玩家攻擊怪物"
-
-#: src/gui/userpalette.cpp:104
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "怪物攻擊玩家"
-
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "致命一擊"
-
-#: src/gui/userpalette.cpp:107
-#, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "玩家攻擊怪物"
-
-#: src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "致命一擊"
-
-#: src/gui/userpalette.cpp:111
-#, fuzzy
-msgid "Local Player Miss"
-msgstr "�存玩家列表"
-
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "失誤"
-
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > 列出在目�頻�的使用者"
@@ -2204,55 +2077,55 @@ msgstr "需�指定��為 op 的使用者�"
 msgid "Need a user to kick!"
 msgstr "需�指定�踢掉的使用者�"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "主�公告："
 
-#: src/gui/widgets/chattab.cpp:126
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 主�公告："
 
-#: src/gui/widgets/chattab.cpp:152
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s 的悄悄話: "
 
-#: src/gui/widgets/whispertab.cpp:52
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "�能傳�空的�天訊��"
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > 關閉悄悄話分�"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "指令： /close"
 
-#: src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "這個指令會關閉目�的悄悄話分�。"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "指令： /item"
 
-#: src/gui/widgets/whispertab.cpp:89
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "這調指令�顯示目�線上人數。"
 
-#: src/gui/widgets/whispertab.cpp:95
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "這個指令會開始將�天紀錄錄製為檔案 <filename>。"
@@ -2280,412 +2153,426 @@ msgstr "更改"
 msgid "Choose World"
 msgstr "�擇您的伺�器"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "上移"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "下移"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "左移"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "�移"
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "攻擊"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "尋找目標攻擊"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "��姆�掉妳了~~"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "說話"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "�止攻擊"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "最接近的目標"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "以 NPC 為目標"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "以玩家為目標"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "撿拾"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "隱�視窗"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "�下"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "螢幕快照"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "啟用/�用交易"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "尋找至滑鼠的路徑"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物��徑� %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "說明視窗"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "狀態視窗"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "物�欄視窗"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "物�視窗"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "技能視窗"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "迷你地圖視窗"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "�天視窗"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "物��徑�視窗"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "設定視窗"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "程�除錯視窗"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "技能視窗"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "表情�徑�視窗"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "狀態視窗"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情�徑� %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "切��天"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "將�天�上�動"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "將�天�下�動"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "�一個�天分�"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "下一個�天分�"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "�擇確定"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "忽略輸入 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "忽略輸入 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "解決按���，�則�戲中�能�到奇怪行為。"
 
-#: src/localplayer.cpp:1248
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "�能拾�物�."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾�了 %s [@@%d|%s@@]."
 msgstr[1] "你拾�了 %s [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr ""
-
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
+#: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "�項:"
 
-#: src/main.cpp:44
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : 顯示�戲版本"
 
-#: src/main.cpp:45
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : 顯示求助說明"
 
-#: src/main.cpp:46
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : 使用此設定檔"
 
-#: src/main.cpp:47
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U -username : 使用此帳號登入"
 
-#: src/main.cpp:48
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : 用此密碼登入"
 
-#: src/main.cpp:49
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : 用此帳號登入"
 
-#: src/main.cpp:50
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : 登錄伺�器埠�稱或IP��"
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : 登錄伺�器埠"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : 使用此更新伺�器"
 
-#: src/main.cpp:53
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default : �擇�設的角色伺�器�角色"
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : �使用更新"
 
-#: src/main.cpp:56
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d -data : 指定�戲資料所在的目錄"
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir : 設定此目錄為家目錄"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : 使用此設定檔"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir : 設定此目錄為家目錄"
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : �使用OpenGL"
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
 msgid "You are dead."
 msgstr "您已經死亡。"
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "我們很�憾的通知您，您的角色已經在戰鬥中被殺了。"
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
 msgid "You are not that alive anymore."
 msgstr "您��是那麼有活力。"
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "殘酷的死神用冰冷的手正在抽出你的�魂。"
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
 msgid "Game Over!"
 msgstr "�戲���"
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "�，孩�。您的角色並沒有真的死掉。他...呃...去了更好的地方。"
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "您想讓敵人的武器�入您的喉嚨好折斷它的計畫失敗了。"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
 msgid "I guess this did not run too well."
 msgstr "我猜這並沒有跑得很好"
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
 msgid "Do you want your possessions identified?"
 msgstr "您想�鑑定你的財產嗎？"
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
 msgid "Sadly, no trace of you was ever found..."
 msgstr "很悲傷的，沒有人發�你的蹤跡..."
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
 msgid "Annihilated."
 msgstr "�飛煙滅了。"
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
 msgid "Looks like you got your head handed to you."
 msgstr "看起來你把你的頭拿在手上。"
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "你�被幹掉啦!!!躺在地上一次�一次!!"
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/beinghandler.cpp:323
 #, fuzzy
 msgid "Press OK to respawn."
 msgstr " 請按確�啟動"
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:324
 #, fuzzy
 msgid "You Died"
 msgstr "您已經死亡"
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Not logged in."
 msgstr "已經登入"
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:147
 #, fuzzy
 msgid "Character's name already exists."
 msgstr "�字已經有人使用"
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
+#: src/net/manaserv/charhandler.cpp:159
 #, fuzzy
 msgid "Character's stats are too high."
 msgstr "角色狀態確定"
 
-#: src/net/manaserv/charhandler.cpp:158
+#: src/net/manaserv/charhandler.cpp:162
 #, fuzzy
 msgid "Character's stats are too low."
 msgstr "角色狀態確定"
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
 #: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
@@ -2693,96 +2580,96 @@ msgstr ""
 msgid "Unknown error."
 msgstr "�明的錯誤"
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr "資訊"
 
-#: src/net/manaserv/charhandler.cpp:193
+#: src/net/manaserv/charhandler.cpp:200
 #, fuzzy
 msgid "Player deleted."
 msgstr "玩家已刪除"
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:212
 #, fuzzy
 msgid "Selection out of range."
 msgstr "請�擇交易的物�數�"
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:215
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "�明的錯誤"
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:250
 msgid "No gameservers are available."
 msgstr "沒有�用的�戲伺�器。"
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr "主題: %s"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
 #, fuzzy
 msgid "Players in this channel:"
 msgstr "玩家攻擊怪物"
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 #, fuzzy
 msgid "Error joining channel."
 msgstr "指令: /join <頻��稱>"
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 #, fuzzy
 msgid "Listing channels."
 msgstr "�求�加頻� %s"
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:303
 #, fuzzy, c-format
 msgid "%s entered the channel."
 msgstr "%s �加了這個派�."
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:308
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:324
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:334
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:339
 #, fuzzy
 msgid "Unknown channel event."
 msgstr "�明指令"
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr "公會已�立."
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr "創建公會時發生錯誤."
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr "發出邀請."
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr "�功��會員."
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr "無法��會員."
 
@@ -2873,11 +2760,11 @@ msgstr "電�郵件已經存在"
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr "�加派�."
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr "%s �加了這個派�."
@@ -2887,190 +2774,137 @@ msgstr "%s �加了這個派�."
 msgid "%s rejected your invite."
 msgstr "%s 拒絕您的邀請。"
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "力�"
-
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "力� %+d"
-
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "��"
-
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "�� %+d"
-
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "閃躲"
-
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr "閃躲 %+d"
-
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "體力"
-
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr "體力 %+d"
-
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "智力"
-
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr "智力 %+d"
-
-#: src/net/manaserv/stats.cpp:116
-#, fuzzy
-msgid "Willpower"
-msgstr "�志力:"
-
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "�志力 %+d"
-
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr "接�傳入的交易�求."
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr "拒絕傳入的交易�求."
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr "�求交易"
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s 請求交易, 是�接�?"
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr "與 %s 交易."
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr "交易已�消。"
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr "交易已完�。"
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "踢人失敗�"
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "踢人�功�"
 
-#: src/net/tmwa/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "沒有任何物��出售."
 
-#: src/net/tmwa/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "��光臨."
 
-#: src/net/tmwa/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "�能購買."
 
-#: src/net/tmwa/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "��你的出售."
 
-#: src/net/tmwa/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "�能出售."
 
-#: src/net/tmwa/charserverhandler.cpp:105
+#: src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "�能使用這個 ID"
 
-#: src/net/tmwa/charserverhandler.cpp:112
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "�明的錯誤"
 
-#: src/net/tmwa/charserverhandler.cpp:138
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "建立角色失敗。最有�能的情形是該�稱已經被使用了。"
 
-#: src/net/tmwa/charserverhandler.cpp:150
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "角色被刪除."
 
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "刪除角色失敗。"
 
-#: src/net/tmwa/charserverhandler.cpp:259
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "力�:"
 
-#: src/net/tmwa/charserverhandler.cpp:260
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "��:"
 
-#: src/net/tmwa/charserverhandler.cpp:261
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "體力:"
 
-#: src/net/tmwa/charserverhandler.cpp:262
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "智力:"
 
-#: src/net/tmwa/charserverhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "閃躲:"
 
-#: src/net/tmwa/charserverhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "幸�:"
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "該玩家已離線,無法�出密語."
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "該玩家拒絕你的密語"
 
-#: src/net/tmwa/chathandler.cpp:190
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "玩家"
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "頻��支��"
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
@@ -3085,80 +2919,125 @@ msgstr "�字"
 msgid "Request to quit denied!"
 msgstr "�求交易"
 
+#: src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr "力� %+d"
+
+#: src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr "�� %+d"
+
+#: src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr "體力 %+d"
+
+#: src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr "智力 %+d"
+
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
+msgid "Dexterity %+d"
+msgstr "閃躲 %+d"
+
+#: src/net/tmwa/generalhandler.cpp:107
+#, c-format
 msgid "Luck %+d"
 msgstr "幸�  %+d"
 
-#: src/net/tmwa/generalhandler.cpp:129
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "驗證失敗"
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "沒有�用的伺�器"
 
-#: src/net/tmwa/generalhandler.cpp:136
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "此帳號正在使用中"
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "這個帳號已經登入"
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "使用加速器"
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "�複登入"
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "�明的連線錯誤"
 
-#: src/net/tmwa/generalhandler.cpp:206
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "和伺�器失去連線"
 
-#: src/net/tmwa/generalhandler.cpp:222
+#: src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "力�"
+
+#: src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "��"
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "體力"
+
+#: src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "智力"
+
+#: src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "閃躲"
+
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "幸�"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "防禦："
 
-#: src/net/tmwa/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "摩攻："
 
-#: src/net/tmwa/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "魔防："
 
-#: src/net/tmwa/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Ac準確度："
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% E迴�率："
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "致命一擊"
@@ -3209,29 +3088,29 @@ msgstr "這個指令會使玩家離開隊�。"
 msgid "Guild name is missing."
 msgstr "�掉隊��稱。"
 
-#: src/net/tmwa/guildhandler.cpp:295
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:300
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:305
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s �在已經是您隊�的�員。"
 
-#: src/net/tmwa/guildhandler.cpp:310
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:315
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "給 %s 的�明邀請回應。"
 
-#: src/net/tmwa/guildhandler.cpp:392
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
@@ -3311,15 +3190,15 @@ msgstr "指令： /exp"
 msgid "This command displays the party's current experience sharing policy."
 msgstr "這個指令會顯示此隊�目�的經驗值分享政策。"
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "物�分享已啟用。"
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "物�分享已�用。"
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "物�分享��能。"
 
@@ -3328,15 +3207,15 @@ msgstr "物�分享��能。"
 msgid "Item sharing unknown."
 msgstr "物�分享已啟用。"
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "經驗值分享已啟用。"
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "經驗值分享已�用。"
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "經驗值分享��能。"
 
@@ -3345,15 +3224,15 @@ msgstr "經驗值分享��能。"
 msgid "Experience sharing unknown."
 msgstr "經驗值分享已啟用。"
 
-#: src/net/tmwa/inventoryhandler.cpp:289
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "�能使用該物�."
 
-#: src/net/tmwa/inventoryhandler.cpp:406
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "無法�備。"
 
-#: src/net/tmwa/inventoryhandler.cpp:417
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "無法�下�備。"
 
@@ -3420,7 +3299,7 @@ msgstr "�能出售."
 msgid "Connection to server terminated. "
 msgstr "正在連接到地圖伺�器..."
 
-#: src/net/tmwa/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "無法建立隊�。"
 
@@ -3428,242 +3307,237 @@ msgstr "無法建立隊�。"
 msgid "Party successfully created."
 msgstr "隊�已�功的建立。"
 
-#: src/net/tmwa/partyhandler.cpp:121
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s 已經是隊�的一員。"
 
-#: src/net/tmwa/partyhandler.cpp:125
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s 拒絕您的邀請。"
 
-#: src/net/tmwa/partyhandler.cpp:129
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s �在已經是您隊�的�員。"
 
-#: src/net/tmwa/partyhandler.cpp:133
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "給 %s 的�明邀請回應。"
 
-#: src/net/tmwa/partyhandler.cpp:241
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "您已經離開此隊�。"
 
-#: src/net/tmwa/partyhandler.cpp:252
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s 已經離開您的隊�。"
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "�明的�員試著�說：%s"
 
 #: src/net/tmwa/partyhandler.cpp:335
-#, fuzzy, c-format
-msgid "Invited user %s to party."
-msgstr "/party > 邀請使用者組隊"
-
-#: src/net/tmwa/partyhandler.cpp:340
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:345
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:374
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s �在您的隊�中�"
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "請投入金幣"
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "您還沒有死。您�在�是在休�。"
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "你已經沒有更多"
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "你已��是."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "你已經�期了,請求助管�員"
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "身體僵硬"
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "失去了生命，您安詳的休�了。"
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "如果你沒有這樣�,你就�會上天堂了!!"
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "你的傳奇已經是�去�了!!"
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "你折斷了樹�"
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "你踢了水桶"
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "死掉了...."
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "您已是�-玩家。"
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "你正走�地�!!"
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "訊�"
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "您已經攜帶超�負�能力的一�。您將無法�復生命。"
 
-#: src/net/tmwa/playerhandler.cpp:344
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "您已經撿起 "
 
-#: src/net/tmwa/playerhandler.cpp:380
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:543
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "先�備箭."
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "交易失敗�"
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "顯示表情失敗�"
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "�下休�失敗�"
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "�天新增失敗�"
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "�能加入隊��"
 
-#: src/net/tmwa/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "無法大��"
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你還沒�到足夠等級�"
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "HP�夠�"
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "SP�夠�"
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "沒有備忘錄"
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "您�在�能那麼��"
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "看來您需�更多錢... ;-)"
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器無法使用此技能�"
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "你需��一顆紅寶石!"
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "你需��一棵�寶石!"
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "你已負�太多，�能�多!"
 
-#: src/net/tmwa/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "阿?那是甚麼?"
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "傳�失敗..."
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "無法��任何物�..."
 
-#: src/net/tmwa/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "藥水無效..."
 
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "交易無法進行。交易�象太�了。"
 
-#: src/net/tmwa/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "無法進行交易。該角色�存在。"
 
-#: src/net/tmwa/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "由於�明的原因已�消交易。"
 
-#: src/net/tmwa/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "交易: 你和 %s"
 
-#: src/net/tmwa/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "�消和 %s 的交易."
 
-#: src/net/tmwa/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
@@ -3679,53 +3553,44 @@ msgstr "加入物�失敗。交易�象沒有空的欄�。"
 msgid "Failed adding item for unknown reason."
 msgstr "由於�明的原因加入物�失敗。"
 
-#: src/playerrelations.cpp:312
+#: src/playerrelations.cpp:310
 #, fuzzy
 msgid "Completely ignore"
 msgstr "@@ignore|完全忽視 %s@@"
 
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:342
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr "攻擊 %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr "防禦 %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr "體力%+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "魔力%+d"
 
-#: src/resources/itemdb.cpp:117
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr "�明的物�"
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr "未知物�"
 
@@ -3776,6 +3641,24 @@ msgstr "未知物�"
 #~ msgid "Hyperlink"
 #~ msgstr "超連�"
 
+#~ msgid "Being"
+#~ msgstr "物件"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "其他使用者�字"
+
+#~ msgid "Own Name"
+#~ msgstr "我的�字"
+
+#~ msgid "GM Names"
+#~ msgstr "�戲管�者�字"
+
+#~ msgid "NPCs"
+#~ msgstr "電腦"
+
+#~ msgid "Monsters"
+#~ msgstr "怪物"
+
 #~ msgid "Unknown Item Type"
 #~ msgstr "�明物�類型"
 
@@ -3820,6 +3703,29 @@ msgstr "未知物�"
 #~ msgid "Ammo"
 #~ msgstr "ç®­"
 
+#~ msgid "Particle Effects"
+#~ msgstr "粒�效果"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "撿拾通知"
+
+#~ msgid "Exp Notification"
+#~ msgstr "經驗值通知"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "玩家攻擊怪物"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "怪物攻擊玩家"
+
+#~ msgid "Critical Hit"
+#~ msgstr "致命一擊"
+
+#~ msgid "Misses"
+#~ msgstr "失誤"
+
 #~ msgid "HP Bar"
 #~ msgstr "血�"
 
@@ -3833,6 +3739,30 @@ msgstr "未知物�"
 #~ msgstr "1/4 血�"
 
 #, fuzzy
+#~ msgid "HP"
+#~ msgstr "體力 :"
+
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "魔力:"
+
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "經驗值:"
+
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "金錢：%d"
+
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "�業:"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "等級：%d"
+
+#, fuzzy
 #~ msgid "Access denied."
 #~ msgstr "存�被拒"
 
@@ -3846,6 +3776,13 @@ msgstr "未知物�"
 #~ msgid "Willpower:"
 #~ msgstr "�志力:"
 
+#~ msgid "Willpower %+d"
+#~ msgstr "�志力 %+d"
+
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "�志力:"
+
 #, fuzzy
 #~ msgid "Server is full."
 #~ msgstr "伺�器人數已滿"
@@ -4108,6 +4045,9 @@ msgstr "未知物�"
 #~ msgid "Command: /whisper <nick> <msg>"
 #~ msgstr "指令： /whisper <暱稱> <信�>"
 
+#~ msgid "Command: /w <nick> <msg>"
+#~ msgstr "指令： /w <暱稱> <信�>"
+
 #~ msgid "This command sends the message <msg> to <nick>."
 #~ msgstr "這個指令發�訊� <msg> 給 <nick>"
 
@@ -4120,6 +4060,9 @@ msgstr "未知物�"
 #~ msgid "@@pickup|Pick Up %s@@"
 #~ msgstr "@@æ’¿èµ·|æ’¿èµ·%s@@"
 
+#~ msgid "Save player list"
+#~ msgstr "�存玩家列表"
+
 #~ msgid "Scroll radius"
 #~ msgstr "�動�徑"
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 35af94fb..79dd72cc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,7 +54,7 @@ ENDIF()
 IF (WIN32)
     SET(EXTRA_LIBRARIES ws2_32 winmm)
     FIND_PACKAGE(LibIntl REQUIRED)
-ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR BEOS)
     FIND_PACKAGE(LibIntl REQUIRED)
 ELSEIF (CMAKE_SYSTEM_NAME STREQUAL SunOS)
     # explicit linking to libintl is required on Solaris
@@ -308,8 +308,6 @@ SET(SRCS
     gui/textdialog.h
     gui/textpopup.cpp
     gui/textpopup.h
-    gui/theme.cpp
-    gui/theme.h
     gui/trade.cpp
     gui/trade.h
     gui/truetypefont.cpp
@@ -318,8 +316,6 @@ SET(SRCS
     gui/unregisterdialog.h
     gui/updatewindow.cpp
     gui/updatewindow.h
-    gui/userpalette.cpp
-    gui/userpalette.h
     gui/viewport.cpp
     gui/viewport.h
     gui/windowmenu.cpp
@@ -358,6 +354,8 @@ SET(SRCS
     resources/ambientlayer.h
     resources/animation.cpp
     resources/animation.h
+    resources/beinginfo.cpp
+    resources/beinginfo.h
     resources/colordb.cpp
     resources/colordb.h
     resources/dye.cpp
@@ -380,8 +378,6 @@ SET(SRCS
     resources/mapreader.h
     resources/monsterdb.cpp
     resources/monsterdb.h
-    resources/monsterinfo.cpp
-    resources/monsterinfo.h
     resources/music.cpp
     resources/music.h
     resources/npcdb.cpp
@@ -392,8 +388,14 @@ SET(SRCS
     resources/resourcemanager.h
     resources/soundeffect.h
     resources/soundeffect.cpp
+    resources/specialdb.cpp
+    resources/specialdb.h
     resources/spritedef.h
     resources/spritedef.cpp
+    resources/theme.cpp
+    resources/theme.h
+    resources/userpalette.cpp
+    resources/userpalette.h
     resources/wallpaper.cpp
     resources/wallpaper.h
     utils/base64.cpp
@@ -414,6 +416,12 @@ SET(SRCS
     utils/xml.h
     utils/zlib.cpp
     utils/zlib.h
+    actor.cpp
+    actor.h
+    actorsprite.cpp
+    actorsprite.h
+    actorspritemanager.cpp
+    actorspritemanager.h
     animatedsprite.cpp
     animatedsprite.h
     animationparticle.cpp
@@ -422,8 +430,8 @@ SET(SRCS
     avatar.h
     being.cpp
     being.h
-    beingmanager.cpp
-    beingmanager.h
+    chatlog.cpp
+    chatlog.h
     client.cpp
     client.h
     channel.cpp
@@ -432,18 +440,21 @@ SET(SRCS
     channelmanager.h
     commandhandler.cpp
     commandhandler.h
-    configlistener.h
+    compoundsprite.cpp
+    compoundsprite.h
     configuration.cpp
     configuration.h
+    defaults.cpp
+    defaults.h
     effectmanager.cpp
     effectmanager.h
     emoteshortcut.cpp
     emoteshortcut.h
     equipment.h
+    event.cpp
+    event.h
     flooritem.cpp
     flooritem.h
-    flooritemmanager.cpp
-    flooritemmanager.h
     game.cpp
     game.h
     graphics.cpp
@@ -453,6 +464,8 @@ SET(SRCS
     guild.h
     imageparticle.cpp
     imageparticle.h
+    imagesprite.cpp
+    imagesprite.h
     inventory.cpp
     inventory.h
     item.cpp
@@ -463,6 +476,8 @@ SET(SRCS
     joystick.h
     keyboardconfig.cpp
     keyboardconfig.h
+    listener.cpp
+    listener.h
     localplayer.cpp
     localplayer.h
     log.cpp
@@ -471,10 +486,6 @@ SET(SRCS
     main.h
     map.cpp
     map.h
-    monster.cpp
-    monster.h
-    npc.cpp
-    npc.h
     openglgraphics.cpp
     openglgraphics.h
     particle.cpp
@@ -486,8 +497,8 @@ SET(SRCS
     particleemitterprop.h
     party.cpp
     party.h
-    player.cpp
-    player.h
+    playerinfo.cpp
+    playerinfo.h
     playerrelations.cpp
     playerrelations.h
     position.cpp
@@ -514,6 +525,7 @@ SET(SRCS
     tileset.h
     units.cpp
     units.h
+    variabledata.h
     vector.cpp
     vector.h
     )
@@ -570,6 +582,8 @@ SET(SRCS_TMWA
 SET(SRCS_MANA
     net/manaserv/adminhandler.cpp
     net/manaserv/adminhandler.h
+    net/manaserv/attributes.cpp
+    net/manaserv/attributes.h
     net/manaserv/beinghandler.cpp
     net/manaserv/beinghandler.h
     net/manaserv/buysellhandler.cpp
@@ -580,6 +594,7 @@ SET(SRCS_MANA
     net/manaserv/chathandler.h
     net/manaserv/connection.cpp
     net/manaserv/connection.h
+    net/manaserv/defines.h
     net/manaserv/effecthandler.cpp
     net/manaserv/effecthandler.h
     net/manaserv/gamehandler.cpp
@@ -610,11 +625,9 @@ SET(SRCS_MANA
     net/manaserv/partyhandler.h
     net/manaserv/playerhandler.cpp
     net/manaserv/playerhandler.h
-    net/manaserv/protocol.h
+    net/manaserv/manaserv_protocol.h
     net/manaserv/specialhandler.cpp
     net/manaserv/specialhandler.h
-    net/manaserv/stats.cpp
-    net/manaserv/stats.h
     net/manaserv/tradehandler.cpp
     net/manaserv/tradehandler.h
     )
diff --git a/src/actor.cpp b/src/actor.cpp
new file mode 100644
index 00000000..5ab7ab51
--- /dev/null
+++ b/src/actor.cpp
@@ -0,0 +1,57 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "actor.h"
+
+#include "map.h"
+
+#include "resources/image.h"
+
+Actor::Actor():
+        mMap(NULL)
+{}
+
+Actor::~Actor()
+{
+    setMap(NULL);
+}
+
+void Actor::setMap(Map *map)
+{
+    // Remove Actor from potential previous map
+    if (mMap)
+        mMap->removeActor(mMapActor);
+
+    mMap = map;
+
+    // Add Actor to potential new map
+    if (mMap)
+        mMapActor = mMap->addActor(this);
+}
+
+int Actor::getTileX() const
+{
+    return getPixelX() / mMap->getTileWidth();
+}
+
+int Actor::getTileY() const
+{
+    return getPixelY() / mMap->getTileHeight();
+}
diff --git a/src/actor.h b/src/actor.h
new file mode 100644
index 00000000..367bcd75
--- /dev/null
+++ b/src/actor.h
@@ -0,0 +1,128 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ACTOR_H
+#define ACTOR_H
+
+#include "vector.h"
+
+#include <list>
+
+class Actor;
+class Graphics;
+class Image;
+class Map;
+
+typedef std::list<Actor*> Actors;
+
+class Actor
+{
+public:
+    Actor();
+
+    virtual ~Actor();
+
+    /**
+     * Draws the Actor to the given graphics context.
+     *
+     * Note: this function could be simplified if the graphics context
+     * would support setting a translation offset. It already does this
+     * partly with the clipping rectangle support.
+     */
+    virtual bool draw(Graphics *graphics, int offsetX, int offsetY) const = 0;
+
+    /**
+     * Returns the horizontal size of the actors graphical representation
+     * in pixels or 0 when it is undefined.
+     */
+    virtual int getWidth() const
+    { return 0; }
+
+    /**
+     * Returns the vertical size of the actors graphical representation
+     * in pixels or 0 when it is undefined.
+     */
+    virtual int getHeight() const
+    { return 0; }
+
+    /**
+     * Returns the pixel position of this actor.
+     */
+    const Vector &getPosition() const
+    { return mPos; }
+
+    /**
+     * Sets the pixel position of this actor.
+     */
+    virtual void setPosition(const Vector &pos)
+    { mPos = pos; }
+
+    /**
+     * Returns the pixels X coordinate of the actor.
+     */
+    int getPixelX() const
+    { return (int) mPos.x; }
+
+    /**
+     * Returns the pixel Y coordinate of the actor.
+     */
+    virtual int getPixelY() const
+    { return (int) mPos.y; }
+
+    /**
+     * Returns the x coordinate in tiles of the actor.
+     */
+    virtual int getTileX() const;
+
+    /**
+     * Returns the y coordinate in tiles of the actor.
+     */
+    virtual int getTileY() const;
+
+    /**
+     * Returns the number of Image layers used to draw the actor.
+     */
+    virtual int getNumberOfLayers() const
+    { return 0; }
+
+    /**
+     * Returns the current alpha value used to draw the actor.
+     */
+    virtual float getAlpha() const = 0;
+
+    /**
+     * Sets the alpha value used to draw the actor.
+     */
+    virtual void setAlpha(float alpha) = 0;
+
+    void setMap(Map *map);
+
+    Map* getMap() const
+    { return mMap; }
+
+protected:
+    Map *mMap;
+    Vector mPos;                /**< Position in pixels relative to map. */
+
+private:
+    Actors::iterator mMapActor;
+};
+
+#endif // ACTOR_H
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp
new file mode 100644
index 00000000..e43d94e1
--- /dev/null
+++ b/src/actorsprite.cpp
@@ -0,0 +1,463 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "actorsprite.h"
+
+#include "client.h"
+#include "event.h"
+#include "imagesprite.h"
+#include "localplayer.h"
+#include "log.h"
+#include "simpleanimation.h"
+#include "sound.h"
+#include "statuseffect.h"
+
+#include "net/net.h"
+
+#include "resources/image.h"
+#include "resources/imageset.h"
+#include "resources/resourcemanager.h"
+#include "resources/theme.h"
+
+#include <cassert>
+
+#define EFFECTS_FILE "effects.xml"
+
+ImageSet *ActorSprite::targetCursorImages[2][NUM_TC];
+SimpleAnimation *ActorSprite::targetCursor[2][NUM_TC];
+bool ActorSprite::loaded = false;
+
+ActorSprite::ActorSprite(int id):
+    mId(id),
+    mStunMode(0),
+    mStatusParticleEffects(&mStunParticleEffects, false),
+    mChildParticleEffects(&mStatusParticleEffects, false),
+    mMustResetParticles(false),
+    mUsedTargetCursor(NULL)
+{}
+
+ActorSprite::~ActorSprite()
+{
+    setMap(NULL);
+
+    mUsedTargetCursor = NULL;
+
+    // Notify listeners of the destruction.
+    Mana::Event event(EVENT_DESTROYED);
+    event.setActor("source", this);
+    event.trigger(CHANNEL_ACTORSPRITE);
+}
+
+bool ActorSprite::draw(Graphics *graphics, int offsetX, int offsetY) const
+{
+    // TODO: Eventually, we probably should fix all sprite offsets so that
+    //       these translations aren't necessary anymore. The sprites know
+    //       best where their base point should be.
+    const int px = getPixelX() + offsetX - 16;
+    // Temporary fix to the Y offset.
+    const int py = getPixelY() + offsetY -
+        ((Net::getNetworkType() == ServerInfo::MANASERV) ? 15 : 32);
+
+    if (mUsedTargetCursor)
+    {
+        mUsedTargetCursor->reset();
+        mUsedTargetCursor->update(tick_time * MILLISECONDS_IN_A_TICK);
+        mUsedTargetCursor->draw(graphics, px, py);
+    }
+
+    return drawSpriteAt(graphics, px, py);
+}
+
+bool ActorSprite::drawSpriteAt(Graphics *graphics, int x, int y) const
+{
+    return CompoundSprite::draw(graphics, x, y);
+}
+
+void ActorSprite::logic()
+{
+    // Update sprite animations
+    update(tick_time * MILLISECONDS_IN_A_TICK);
+
+    // Restart status/particle effects, if needed
+    if (mMustResetParticles)
+    {
+        mMustResetParticles = false;
+        for (std::set<int>::iterator it = mStatusEffects.begin();
+             it != mStatusEffects.end(); it++)
+        {
+            const StatusEffect *effect = StatusEffect::getStatusEffect(*it, true);
+            if (effect && effect->particleEffectIsPersistent())
+                updateStatusEffect(*it, true);
+        }
+    }
+
+    // Update particle effects
+    mChildParticleEffects.moveTo(mPos.x, mPos.y);
+}
+
+void ActorSprite::actorLogic()
+{
+}
+
+void ActorSprite::setMap(Map* map)
+{
+    Actor::setMap(map);
+
+    // Clear particle effect list because child particles became invalid
+    mChildParticleEffects.clear();
+    mMustResetParticles = true; // Reset status particles on next redraw
+}
+
+void ActorSprite::controlParticle(Particle *particle)
+{
+    mChildParticleEffects.addLocally(particle);
+}
+
+void ActorSprite::setTargetType(TargetCursorType type)
+{
+    if (type == TCT_NONE)
+        untarget();
+    else
+        mUsedTargetCursor = targetCursor[type][getTargetCursorSize()];
+}
+
+struct EffectDescription {
+    std::string mGFXEffect;
+    std::string mSFXEffect;
+};
+
+static EffectDescription *default_effect = NULL;
+static std::map<int, EffectDescription *> effects;
+static bool effects_initialized = false;
+
+static EffectDescription *getEffectDescription(xmlNodePtr node, int *id)
+{
+    EffectDescription *ed = new EffectDescription;
+
+    *id = atoi(XML::getProperty(node, "id", "-1").c_str());
+    ed->mSFXEffect = XML::getProperty(node, "audio", "");
+    ed->mGFXEffect = XML::getProperty(node, "particle", "");
+
+    return ed;
+}
+
+static EffectDescription *getEffectDescription(int effectId)
+{
+    if (!effects_initialized)
+    {
+        XML::Document doc(EFFECTS_FILE);
+        xmlNodePtr root = doc.rootNode();
+
+        if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects"))
+        {
+            logger->log("Error loading being effects file: "
+                    EFFECTS_FILE);
+            return NULL;
+        }
+
+        for_each_xml_child_node(node, root)
+        {
+            int id;
+
+            if (xmlStrEqual(node->name, BAD_CAST "effect"))
+            {
+                EffectDescription *EffectDescription =
+                    getEffectDescription(node, &id);
+                effects[id] = EffectDescription;
+            }
+            else if (xmlStrEqual(node->name, BAD_CAST "default"))
+            {
+                EffectDescription *effectDescription =
+                    getEffectDescription(node, &id);
+
+                if (default_effect)
+                    delete default_effect;
+
+                default_effect = effectDescription;
+            }
+        }
+
+        effects_initialized = true;
+    } // done initializing
+
+    EffectDescription *ed = effects[effectId];
+
+    return ed ? ed : default_effect;
+}
+
+void ActorSprite::setStatusEffect(int index, bool active)
+{
+    const bool wasActive = mStatusEffects.find(index) != mStatusEffects.end();
+
+    if (active != wasActive)
+    {
+        updateStatusEffect(index, active);
+        if (active)
+            mStatusEffects.insert(index);
+        else
+            mStatusEffects.erase(index);
+    }
+}
+
+void ActorSprite::setStatusEffectBlock(int offset, Uint16 newEffects)
+{
+    for (int i = 0; i < STATUS_EFFECTS; i++)
+    {
+        int index = StatusEffect::blockEffectIndexToEffectIndex(offset + i);
+
+        if (index != -1)
+            setStatusEffect(index, (newEffects & (1 << i)) > 0);
+    }
+}
+
+void ActorSprite::internalTriggerEffect(int effectId, bool sfx, bool gfx)
+{
+    logger->log("Special effect #%d on %s", effectId,
+                getId() == player_node->getId() ? "self" : "other");
+
+    EffectDescription *ed = getEffectDescription(effectId);
+
+    if (!ed)
+    {
+        logger->log("Unknown special effect and no default recorded");
+        return;
+    }
+
+    if (gfx && !ed->mGFXEffect.empty())
+    {
+        Particle *selfFX;
+
+        selfFX = particleEngine->addEffect(ed->mGFXEffect, 0, 0);
+        controlParticle(selfFX);
+    }
+
+    if (sfx && !ed->mSFXEffect.empty())
+        sound.playSfx(ed->mSFXEffect);
+}
+
+void ActorSprite::updateStunMode(int oldMode, int newMode)
+{
+    if (this == player_node)
+    {
+        Mana::Event event(EVENT_STUN);
+        event.setInt("oldMode", oldMode);
+        event.setInt("newMode", newMode);
+        event.trigger(CHANNEL_ACTORSPRITE);
+    }
+
+    handleStatusEffect(StatusEffect::getStatusEffect(oldMode, false), -1);
+    handleStatusEffect(StatusEffect::getStatusEffect(newMode, true), -1);
+}
+
+void ActorSprite::updateStatusEffect(int index, bool newStatus)
+{
+    if (this == player_node)
+    {
+        Mana::Event event(EVENT_UPDATESTATUSEFFECT);
+        event.setInt("index", index);
+        event.setBool("newStatus", newStatus);
+        event.trigger(CHANNEL_ACTORSPRITE);
+    }
+
+    handleStatusEffect(StatusEffect::getStatusEffect(index, newStatus), index);
+}
+
+void ActorSprite::handleStatusEffect(StatusEffect *effect, int effectId)
+{
+    if (!effect)
+        return;
+
+    // TODO: Find out how this is meant to be used
+    // (SpriteAction != Being::Action)
+    //SpriteAction action = effect->getAction();
+    //if (action != ACTION_INVALID)
+    //    setAction(action);
+
+    Particle *particle = effect->getParticle();
+
+    if (effectId >= 0)
+    {
+        mStatusParticleEffects.setLocally(effectId, particle);
+    }
+    else
+    {
+        mStunParticleEffects.clearLocally();
+        if (particle)
+            mStunParticleEffects.addLocally(particle);
+    }
+}
+
+void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
+                                     bool forceDisplay)
+{
+    clear();
+
+    SpriteRefs it, it_end;
+
+    for (it = display.sprites.begin(), it_end = display.sprites.end();
+         it != it_end; it++)
+    {
+        std::string file = "graphics/sprites/" + (*it)->sprite;
+        int variant = (*it)->variant;
+        addSprite(AnimatedSprite::load(file, variant));
+    }
+
+    // Ensure that something is shown, if desired
+    if (size() == 0 && forceDisplay)
+    {
+        if (display.image.empty())
+            addSprite(AnimatedSprite::load("graphics/sprites/error.xml"));
+        else
+        {
+            ResourceManager *resman = ResourceManager::getInstance();
+            std::string imagePath = "graphics/items/" + display.image;
+            Image *img = resman->getImage(imagePath);
+
+            if (!img)
+                img = Theme::getImageFromTheme("unknown-item.png");
+
+            addSprite(new ImageSprite(img));
+        }
+    }
+
+    mChildParticleEffects.clear();
+
+    //setup particle effects
+    if (Particle::enabled)
+    {
+        std::list<std::string>::const_iterator it, it_end;
+        for (it = display.particles.begin(), it_end = display.particles.end();
+             it != it_end; it++)
+        {
+            Particle *p = particleEngine->addEffect(*it, 0, 0);
+            controlParticle(p);
+        }
+    }
+
+    mMustResetParticles = true;
+}
+
+void ActorSprite::load()
+{
+    if (loaded)
+        unload();
+
+    initTargetCursor();
+
+    loaded = true;
+}
+
+void ActorSprite::unload()
+{
+    if (!loaded)
+        return;
+
+    cleanupTargetCursors();
+    loaded = false;
+}
+
+static const char *cursorType(int type)
+{
+    switch (type)
+    {
+    case ActorSprite::TCT_IN_RANGE:
+        return "in-range";
+    case ActorSprite::TCT_NORMAL:
+        return "normal";
+    default:
+        assert(false);
+    }
+}
+
+static const char *cursorSize(int size)
+{
+    switch (size)
+    {
+    case ActorSprite::TC_LARGE:
+        return "l";
+    case ActorSprite::TC_MEDIUM:
+        return "m";
+    case ActorSprite::TC_SMALL:
+        return "s";
+    default:
+        assert(false);
+    }
+}
+
+void ActorSprite::initTargetCursor()
+{
+    static std::string targetCursor = "graphics/target-cursor-%s-%s.png";
+    static int targetWidths[NUM_TC] = {44, 62, 82};
+    static int targetHeights[NUM_TC] = {35, 44, 60};
+
+    // Load target cursors
+    for (int size = TC_SMALL; size < NUM_TC; size++)
+    {
+        for (int type = TCT_NORMAL; type < NUM_TCT; type++)
+        {
+            loadTargetCursor(strprintf(targetCursor.c_str(), cursorType(type),
+                                       cursorSize(size)), targetWidths[size],
+                             targetHeights[size], type, size);
+        }
+    }
+}
+
+void ActorSprite::cleanupTargetCursors()
+{
+    for (int size = TC_SMALL; size < NUM_TC; size++)
+    {
+        for (int type = TCT_NORMAL; type < NUM_TCT; type++)
+        {
+            delete targetCursor[type][size];
+            if (targetCursorImages[type][size])
+                targetCursorImages[type][size]->decRef();
+        }
+    }
+}
+
+void ActorSprite::loadTargetCursor(const std::string &filename,
+                                   int width, int height, int type, int size)
+{
+    assert(size > -1);
+    assert(size < 3);
+
+    ResourceManager *resman = ResourceManager::getInstance();
+    ImageSet *currentImageSet = resman->getImageSet(filename, width, height);
+
+    if (!currentImageSet)
+    {
+        logger->log("Error loading target cursor: %s", filename.c_str());
+        return;
+    }
+
+    Animation *anim = new Animation;
+
+    for (unsigned int i = 0; i < currentImageSet->size(); ++i)
+    {
+        anim->addFrame(currentImageSet->get(i), 75,
+                      (16 - (currentImageSet->getWidth() / 2)),
+                      (16 - (currentImageSet->getHeight() / 2)));
+    }
+
+    SimpleAnimation *currentCursor = new SimpleAnimation(anim);
+
+    targetCursorImages[type][size] = currentImageSet;
+    targetCursor[type][size] = currentCursor;
+}
diff --git a/src/actorsprite.h b/src/actorsprite.h
new file mode 100644
index 00000000..ab945d2f
--- /dev/null
+++ b/src/actorsprite.h
@@ -0,0 +1,233 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ACTORSPRITE_H
+#define ACTORSPRITE_H
+
+#include "actor.h"
+#include "compoundsprite.h"
+#include "map.h"
+#include "particlecontainer.h"
+
+#include <SDL_types.h>
+
+#include <set>
+#include <list>
+
+class SimpleAnimation;
+class StatusEffect;
+
+class ActorSprite : public CompoundSprite, public Actor
+{
+public:
+    enum Type
+    {
+        UNKNOWN,
+        PLAYER,
+        NPC,
+        MONSTER,
+        FLOOR_ITEM
+    };
+
+    enum TargetCursorSize
+    {
+        TC_SMALL = 0,
+        TC_MEDIUM,
+        TC_LARGE,
+        NUM_TC
+    };
+
+    enum TargetCursorType
+    {
+        TCT_NONE = -1,
+        TCT_NORMAL = 0,
+        TCT_IN_RANGE,
+        NUM_TCT
+    };
+
+    ActorSprite(int id);
+
+    ~ActorSprite();
+
+    int getId() const
+    { return mId; }
+
+    void setId(int id) { mId = id; }
+
+    /**
+     * Returns the type of the ActorSprite.
+     */
+    virtual Type getType() const { return UNKNOWN; }
+
+    virtual bool draw(Graphics *graphics, int offsetX, int offsetY) const;
+
+    virtual bool drawSpriteAt(Graphics *graphics, int x, int y) const;
+
+    virtual void logic();
+
+    static void actorLogic();
+
+    void setMap(Map* map);
+
+    /**
+     * Gets the way the object blocks pathfinding for other objects
+     */
+    virtual Map::BlockType getBlockType() const
+    { return Map::BLOCKTYPE_NONE; }
+
+    /**
+     * Take control of a particle.
+     */
+    void controlParticle(Particle *particle);
+
+    /**
+     * Returns the required size of a target cursor for this being.
+     */
+    virtual TargetCursorSize getTargetCursorSize() const
+    { return TC_MEDIUM; }
+
+    /**
+     * Sets the target animation for this actor.
+     */
+    void setTargetType(TargetCursorType type);
+
+    /**
+     * Untargets the actor.
+     */
+    void untarget() { mUsedTargetCursor = NULL; }
+
+    /**
+     * Triggers a visual effect, such as `level up'. Only draws the visual
+     * effect, does not play sound effects.
+     *
+     * \param effectId ID of the effect to trigger
+     */
+    virtual void triggerEffect(int effectId)
+    {
+        internalTriggerEffect(effectId, false, true);
+    }
+
+    /**
+     * Sets the actor's stun mode. If zero, the being is `normal', otherwise it
+     * is `stunned' in some fashion.
+     */
+    void setStunMode(int stunMode)
+    {
+        if (mStunMode != stunMode)
+            updateStunMode(mStunMode, stunMode);
+        mStunMode = stunMode;
+    }
+
+    void setStatusEffect(int index, bool active);
+
+    /**
+     * A status effect block is a 16 bit mask of status effects. We assign each
+     * such flag a block ID of offset + bitnr.
+     *
+     * These are NOT the same as the status effect indices.
+     */
+    void setStatusEffectBlock(int offset, Uint16 flags);
+
+    virtual void setAlpha(float alpha)
+    { CompoundSprite::setAlpha(alpha); }
+
+    virtual float getAlpha() const
+    { return CompoundSprite::getAlpha(); }
+
+    virtual int getWidth() const
+    { return CompoundSprite::getWidth(); }
+
+    virtual int getHeight() const
+    { return CompoundSprite::getHeight(); }
+
+    static void load();
+
+    static void unload();
+
+protected:
+    /**
+     * Trigger visual effect, with components
+     *
+     * \param effectId ID of the effect to trigger
+     * \param sfx Whether to trigger sound effects
+     * \param gfx Whether to trigger graphical effects
+     */
+    void internalTriggerEffect(int effectId, bool sfx, bool gfx);
+
+    /**
+     * Notify self that the stun mode has been updated. Invoked by
+     * setStunMode if something changed.
+     */
+    virtual void updateStunMode(int oldMode, int newMode);
+
+    /**
+     * Notify self that a status effect has flipped.
+     * The new flag is passed.
+     */
+    virtual void updateStatusEffect(int index, bool newStatus);
+
+    /**
+     * Handle an update to a status or stun effect
+     *
+     * \param The StatusEffect to effect
+     * \param effectId -1 for stun, otherwise the effect index
+     */
+    virtual void handleStatusEffect(StatusEffect *effect, int effectId);
+
+    void setupSpriteDisplay(const SpriteDisplay &display,
+                            bool forceDisplay = true);
+
+    int mId;
+    Uint16 mStunMode;               /**< Stun mode; zero if not stunned */
+    std::set<int> mStatusEffects;   /**< set of active status effects */
+
+    ParticleList mStunParticleEffects;
+    ParticleVector mStatusParticleEffects;
+    ParticleList mChildParticleEffects;
+
+private:
+    /** Reset particle status effects on next redraw? */
+    bool mMustResetParticles;
+
+    /** Load the target cursors into memory */
+    static void initTargetCursor();
+
+    /** Remove the target cursors from memory */
+    static void cleanupTargetCursors();
+
+    /**
+     * Helper function for loading target cursors
+     */
+    static void loadTargetCursor(const std::string &filename,
+                                 int width, int height, int type, int size);
+
+    /** Images of the target cursor. */
+    static ImageSet *targetCursorImages[NUM_TCT][NUM_TC];
+
+    /** Animated target cursors. */
+    static SimpleAnimation *targetCursor[NUM_TCT][NUM_TC];
+
+    static bool loaded;
+
+    /** Target cursor being used */
+    SimpleAnimation *mUsedTargetCursor;
+};
+
+#endif // ACTORSPRITE_H
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
new file mode 100644
index 00000000..a4b61ed3
--- /dev/null
+++ b/src/actorspritemanager.cpp
@@ -0,0 +1,343 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "actorspritemanager.h"
+
+#include "localplayer.h"
+
+#include "utils/dtor.h"
+
+#include <cassert>
+
+#define for_actors ActorSpritesConstIterator it, it_end; \
+for (it = mActors.begin(), it_end = mActors.end() ; it != it_end; it++)
+
+class FindBeingFunctor
+{
+    public:
+        bool operator() (ActorSprite *actor)
+        {
+            if (actor->getType() == ActorSprite::FLOOR_ITEM)
+                return false;
+            Being* b = static_cast<Being*>(actor);
+
+            Uint16 other_y = y + ((b->getType() == ActorSprite::NPC) ? 1 : 0);
+            const Vector &pos = b->getPosition();
+            return ((int) pos.x / 32 == x &&
+                    ((int) pos.y / 32 == y || (int) pos.y / 32 == other_y) &&
+                    b->isAlive() &&
+                    (type == ActorSprite::UNKNOWN || b->getType() == type));
+        }
+
+        Uint16 x, y;
+        ActorSprite::Type type;
+} beingFinder;
+
+class PlayerNamesLister : public AutoCompleteLister
+{
+    void getAutoCompleteList(std::vector<std::string>& names) const
+    {
+        names.clear();
+
+        const ActorSprites &mActors = actorSpriteManager->getAll();
+        for_actors
+        {
+            if ((*it)->getType() == ActorSprite::FLOOR_ITEM)
+                continue;
+
+            Being *being = static_cast<Being*>(*it);
+            if (being->getType() == Being::PLAYER && being->getName() != "")
+                names.push_back(being->getName());
+        }
+    }
+};
+
+class PlayerNPCNamesLister : public AutoCompleteLister
+{
+    void getAutoCompleteList(std::vector<std::string>& names) const
+    {
+        names.clear();
+
+        const ActorSprites &mActors = actorSpriteManager->getAll();
+        for_actors
+        {
+            if ((*it)->getType() == ActorSprite::FLOOR_ITEM)
+                continue;
+
+            Being *being = static_cast<Being*>(*it);
+            if ((being->getType() == Being::PLAYER
+                 || being->getType() == Being::NPC)
+                && being->getName() != "")
+                names.push_back(being->getName());
+        }
+    }
+};
+
+ActorSpriteManager::ActorSpriteManager()
+{
+    mPlayerNames = new PlayerNamesLister;
+    mPlayerNPCNames = new PlayerNPCNamesLister;
+}
+
+ActorSpriteManager::~ActorSpriteManager()
+{
+    clear();
+}
+
+void ActorSpriteManager::setMap(Map *map)
+{
+    mMap = map;
+
+    if (player_node)
+        player_node->setMap(map);
+}
+
+void ActorSpriteManager::setPlayer(LocalPlayer *player)
+{
+    player_node = player;
+    mActors.insert(player);
+}
+
+Being *ActorSpriteManager::createBeing(int id, ActorSprite::Type type, int subtype)
+{
+    Being *being = new Being(id, type, subtype, mMap);
+
+    mActors.insert(being);
+    return being;
+}
+
+FloorItem *ActorSpriteManager::createItem(int id, int itemId, int x, int y)
+{
+    FloorItem *floorItem = new FloorItem(id, itemId, x, y, mMap);
+
+    mActors.insert(floorItem);
+    return floorItem;
+}
+
+void ActorSpriteManager::destroy(ActorSprite *actor)
+{
+    if (!actor || actor == player_node)
+        return;
+
+    mDeleteActors.insert(actor);
+}
+
+Being *ActorSpriteManager::findBeing(int id) const
+{
+    for_actors
+    {
+        ActorSprite *actor = *it;
+        if (actor->getId() == id &&
+            actor->getType() != ActorSprite::FLOOR_ITEM)
+            return static_cast<Being*>(actor);
+    }
+
+    return NULL;
+}
+
+Being *ActorSpriteManager::findBeing(int x, int y, ActorSprite::Type type) const
+{
+    beingFinder.x = x;
+    beingFinder.y = y;
+    beingFinder.type = type;
+
+    ActorSpritesConstIterator it = find_if(mActors.begin(), mActors.end(),
+                                           beingFinder);
+
+    return (it == mActors.end()) ? NULL : static_cast<Being*>(*it);
+}
+
+Being *ActorSpriteManager::findBeingByPixel(int x, int y) const
+{
+    for_actors
+    {
+        if ((*it)->getType() == ActorSprite::FLOOR_ITEM)
+            continue;
+
+        Being *being = static_cast<Being*>(*it);
+
+        int xtol = being->getWidth() / 2;
+        int uptol = being->getHeight();
+
+        if ((being->isAlive()) &&
+            (being != player_node) &&
+            (being->getPixelX() - xtol <= x) &&
+            (being->getPixelX() + xtol >= x) &&
+            (being->getPixelY() - uptol <= y) &&
+            (being->getPixelY() >= y))
+            return being;
+    }
+
+    return NULL;
+}
+
+FloorItem *ActorSpriteManager::findItem(int id) const
+{
+    for_actors
+    {
+        if ((*it)->getId() == id &&
+            (*it)->getType() == ActorSprite::FLOOR_ITEM)
+        {
+            return static_cast<FloorItem*>(*it);
+        }
+    }
+
+    return NULL;
+}
+
+FloorItem *ActorSpriteManager::findItem(int x, int y) const
+{
+    for_actors
+    {
+        if ((*it)->getTileX() == x && (*it)->getTileY() == y &&
+            (*it)->getType() == ActorSprite::FLOOR_ITEM)
+        {
+            return static_cast<FloorItem*>(*it);
+        }
+    }
+
+    return NULL;
+}
+
+Being *ActorSpriteManager::findBeingByName(const std::string &name,
+                                     ActorSprite::Type type) const
+{
+    for_actors
+    {
+        if ((*it)->getType() == ActorSprite::FLOOR_ITEM)
+            continue;
+
+        Being *being = static_cast<Being*>(*it);
+        if (being->getName() == name &&
+           (type == ActorSprite::UNKNOWN || type == being->getType()))
+            return being;
+    }
+    return NULL;
+}
+
+const ActorSprites &ActorSpriteManager::getAll() const
+{
+    return mActors;
+}
+
+void ActorSpriteManager::logic()
+{
+    for_actors
+        (*it)->logic();
+
+    for (it = mDeleteActors.begin(), it_end = mDeleteActors.end();
+         it != it_end; ++it)
+    {
+        mActors.erase(*it);
+        delete *it;
+    }
+
+    mDeleteActors.clear();
+}
+
+void ActorSpriteManager::clear()
+{
+    if (player_node)
+        mActors.erase(player_node);
+
+    for_actors
+        delete *it;
+    mActors.clear();
+    mDeleteActors.clear();
+
+    if (player_node)
+        mActors.insert(player_node);
+}
+
+Being *ActorSpriteManager::findNearestLivingBeing(int x, int y,
+                                                  int maxTileDist,
+                                                  ActorSprite::Type type,
+                                                  Being *excluded) const
+{
+    Being *closestBeing = 0;
+    int dist = 0;
+
+    const int maxDist = maxTileDist * 32;
+
+    for_actors
+    {
+        if ((*it)->getType() == ActorSprite::FLOOR_ITEM)
+            continue;
+
+        Being *being = static_cast<Being*>(*it);
+        const Vector &pos = being->getPosition();
+        int d = abs(((int) pos.x) - x) + abs(((int) pos.y) - y);
+
+        if ((being->getType() == type || type == ActorSprite::UNKNOWN)
+                && (d < dist || !closestBeing)  // it is closer
+                && being->isAlive()             // no dead beings
+                && being != excluded)
+        {
+            dist = d;
+            closestBeing = being;
+        }
+    }
+
+    return (maxDist >= dist) ? closestBeing : 0;
+}
+
+Being *ActorSpriteManager::findNearestLivingBeing(Being *aroundBeing,
+                                                  int maxDist,
+                                                  ActorSprite::Type type) const
+{
+    const Vector &pos = aroundBeing->getPosition();
+    return findNearestLivingBeing((int)pos.x, (int)pos.y, maxDist, type,
+                                  aroundBeing);
+}
+
+bool ActorSpriteManager::hasActorSprite(ActorSprite *actor) const
+{
+    for_actors
+    {
+        if (actor == *it)
+            return true;
+    }
+
+    return false;
+}
+
+AutoCompleteLister *ActorSpriteManager::getPlayerNameLister()
+{
+    return mPlayerNames;
+}
+
+AutoCompleteLister *ActorSpriteManager::getPlayerNPCNameLister()
+{
+    return mPlayerNPCNames;
+}
+
+void ActorSpriteManager::updatePlayerNames()
+{
+    for_actors
+    {
+        if ((*it)->getType() == ActorSprite::FLOOR_ITEM)
+            continue;
+
+        Being *being = static_cast<Being*>(*it);
+        if (being->getType() == ActorSprite::PLAYER && being->getName() != "")
+            being->updateName();
+    }
+}
diff --git a/src/beingmanager.h b/src/actorspritemanager.h
index f2f8eb6d..d6aa609b 100644
--- a/src/beingmanager.h
+++ b/src/actorspritemanager.h
@@ -19,27 +19,31 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BEINGMANAGER_H
-#define BEINGMANAGER_H
+#ifndef ACTORSPRITEMANAGER_H
+#define ACTORSPRITEMANAGER_H
 
+#include "actorsprite.h"
 #include "being.h"
+#include "flooritem.h"
 
 #include "gui/widgets/textfield.h"
 
 class LocalPlayer;
 class Map;
 
-typedef std::list<Being*> Beings;
+typedef std::set<ActorSprite*> ActorSprites;
+typedef ActorSprites::iterator ActorSpritesIterator;
+typedef ActorSprites::const_iterator ActorSpritesConstIterator;
 
-class BeingManager
+class ActorSpriteManager
 {
     public:
-        BeingManager();
+        ActorSpriteManager();
 
-        ~BeingManager();
+        ~ActorSpriteManager();
 
         /**
-         * Sets the map on which beings are created.
+         * Sets the map on which ActorSprites are created.
          */
         void setMap(Map *map);
 
@@ -49,27 +53,48 @@ class BeingManager
         void setPlayer(LocalPlayer *player);
 
         /**
-         * Create a being and add it to the list of beings.
+         * Create a Being and add it to the list of ActorSprites.
          */
-        Being *createBeing(int id, Being::Type type, int subtype);
+        Being *createBeing(int id, ActorSprite::Type type, int subtype);
 
         /**
-         * Remove a Being.
+         * Create a FloorItem and add it to the list of ActorSprites.
          */
-        void destroyBeing(Being *being);
+        FloorItem *createItem(int id, int itemId, int x, int y);
 
         /**
-         * Returns a specific id Being.
+         * Destroys the given ActorSprite at the end of
+         * ActorSpriteManager::logic.
+         */
+        void destroy(ActorSprite *actor);
+
+        /**
+         * Returns a specific Being, by id;
          */
         Being *findBeing(int id) const;
 
         /**
          * Returns a being at specific coordinates.
          */
-        Being *findBeing(int x, int y, Being::Type type = Being::UNKNOWN) const;
+        Being *findBeing(int x, int y,
+                         ActorSprite::Type type = ActorSprite::UNKNOWN) const;
+
+        /**
+         * Returns a being at the specific pixel.
+         */
         Being *findBeingByPixel(int x, int y) const;
 
         /**
+         * Returns a specific FloorItem, by id.
+         */
+        FloorItem *findItem(int id) const;
+
+        /**
+         * Returns a FloorItem at specific coordinates.
+         */
+        FloorItem *findItem(int x, int y) const;
+
+        /**
          * Returns a being nearest to specific coordinates.
          *
          * @param x           X coordinate in pixels.
@@ -80,7 +105,7 @@ class BeingManager
          * @param excluded    The being to exclude from the search.
          */
         Being *findNearestLivingBeing(int x, int y, int maxTileDist,
-                                      Being::Type type = Being::UNKNOWN,
+                                      ActorSprite::Type type = Being::UNKNOWN,
                                       Being *excluded = 0) const;
 
         /**
@@ -92,35 +117,35 @@ class BeingManager
          * @param type        The type of being to look for.
          */
         Being *findNearestLivingBeing(Being *aroundBeing, int maxTileDist,
-                                      Being::Type type = Being::UNKNOWN) const;
+                                ActorSprite::Type type = Being::UNKNOWN) const;
 
         /**
          * Finds a being by name and (optionally) by type.
          */
         Being *findBeingByName(const std::string &name,
-                               Being::Type type = Being::UNKNOWN) const;
+                                ActorSprite::Type type = Being::UNKNOWN) const;
 
         /**
          * Returns the whole list of beings.
          */
-        const Beings &getAll() const;
+        const ActorSprites &getAll() const;
 
         /**
-         * Returns true if the given being is in the manager's list, false
-         * otherwise.
+         * Returns true if the given ActorSprite is in the manager's list,
+         * false otherwise.
          *
-         * \param being the being to search for
+         * \param actor the ActorSprite to search for
          */
-        bool hasBeing(Being *being) const;
+        bool hasActorSprite(ActorSprite *actor) const;
 
         /**
-         * Performs being logic and deletes dead beings when they have been
-         * dead long enough.
+         * Performs ActorSprite logic and deletes ActorSprite scheduled to be
+         * deleted.
          */
         void logic();
 
         /**
-         * Destroys all beings except the local player
+         * Destroys all ActorSprites except the local player
          */
         void clear();
 
@@ -136,10 +161,11 @@ class BeingManager
 
         AutoCompleteLister *mPlayerNames;
         AutoCompleteLister *mPlayerNPCNames;
-        Beings mBeings;
+        ActorSprites mActors;
+        ActorSprites mDeleteActors;
         Map *mMap;
 };
 
-extern BeingManager *beingManager;
+extern ActorSpriteManager *actorSpriteManager;
 
-#endif
+#endif // ACTORSPRITEMANAGER_H
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 59bf2f88..9f4e46bd 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -22,15 +22,12 @@
 #include "animatedsprite.h"
 
 #include "graphics.h"
-#include "log.h"
 
 #include "resources/action.h"
 #include "resources/animation.h"
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
-#include "utils/xml.h"
-
 #include <cassert>
 
 AnimatedSprite::AnimatedSprite(SpriteDef *sprite):
@@ -41,16 +38,17 @@ AnimatedSprite::AnimatedSprite(SpriteDef *sprite):
     mSprite(sprite),
     mAction(0),
     mAnimation(0),
-    mFrame(0),
-    mAlpha(1.0f)
+    mFrame(0)
 {
     assert(mSprite);
 
+    mAlpha = 1.0f;
+
     // Take possession of the sprite
     mSprite->incRef();
 
     // Play the stand animation by default
-    play(ACTION_STAND);
+    play(SpriteAction::STAND);
 }
 
 AnimatedSprite *AnimatedSprite::load(const std::string &filename, int variant)
@@ -69,18 +67,22 @@ AnimatedSprite::~AnimatedSprite()
     mSprite->decRef();
 }
 
-void AnimatedSprite::reset()
+bool AnimatedSprite::reset()
 {
+    bool ret = mFrameIndex !=0 || mFrameTime != 0 || mLastTime != 0;
+
     mFrameIndex = 0;
     mFrameTime = 0;
     mLastTime = 0;
+
+    return ret;
 }
 
-void AnimatedSprite::play(SpriteAction spriteAction)
+bool AnimatedSprite::play(std::string spriteAction)
 {
     Action *action = mSprite->getAction(spriteAction);
     if (!action)
-        return;
+        return false;
 
     mAction = action;
     Animation *animation = mAction->getAnimation(mDirection);
@@ -91,10 +93,14 @@ void AnimatedSprite::play(SpriteAction spriteAction)
         mFrame = mAnimation->getFrame(0);
 
         reset();
+
+        return true;
     }
+
+    return false;
 }
 
-void AnimatedSprite::update(int time)
+bool AnimatedSprite::update(int time)
 {
     // Avoid freaking out at first frame or when tick_time overflows
     if (time < mLastTime || mLastTime == 0)
@@ -102,16 +108,22 @@ void AnimatedSprite::update(int time)
 
     // If not enough time has passed yet, do nothing
     if (time <= mLastTime || !mAnimation)
-        return;
+        return false;
 
     unsigned int dt = time - mLastTime;
     mLastTime = time;
 
+    Animation *animation = mAnimation;
+    Frame *frame = mFrame;
+
     if (!updateCurrentAnimation(dt))
     {
         // Animation finished, reset to default
-        play(ACTION_STAND);
+        play(SpriteAction::STAND);
     }
+
+    // Make sure something actually changed
+    return animation != mAnimation || frame != mFrame;
 }
 
 bool AnimatedSprite::updateCurrentAnimation(unsigned int time)
@@ -158,14 +170,14 @@ bool AnimatedSprite::draw(Graphics *graphics, int posX, int posY) const
                                posY + mFrame->offsetY);
 }
 
-void AnimatedSprite::setDirection(SpriteDirection direction)
+bool AnimatedSprite::setDirection(SpriteDirection direction)
 {
     if (mDirection != direction)
     {
         mDirection = direction;
 
         if (!mAction)
-            return;
+            return false;
 
         Animation *animation = mAction->getAnimation(mDirection);
 
@@ -175,7 +187,23 @@ void AnimatedSprite::setDirection(SpriteDirection direction)
             mFrame = mAnimation->getFrame(0);
             reset();
         }
+
+        return true;
     }
+
+    return false;
+}
+
+size_t AnimatedSprite::getCurrentFrame() const
+{
+    return mFrameIndex;
+}
+
+size_t AnimatedSprite::getFrameCount() const
+{
+    if (mAnimation)
+        return mAnimation->getLength();
+    return 0;
 }
 
 int AnimatedSprite::getWidth() const
@@ -193,3 +221,8 @@ int AnimatedSprite::getHeight() const
     else
         return 0;
 }
+
+const Image* AnimatedSprite::getImage() const
+{
+    return mFrame ? mFrame->image : 0;
+}
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index 54b63cc0..bd39c267 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -22,19 +22,18 @@
 #ifndef ANIMATEDSPRITE_H
 #define ANIMATEDSPRITE_H
 
-#include "resources/spritedef.h"
+#include "sprite.h"
 
 #include <map>
 #include <string>
 
 class Animation;
-class Graphics;
 struct Frame;
 
 /**
  * Animates a sprite by adding playback state.
  */
-class AnimatedSprite
+class AnimatedSprite : public Sprite
 {
     public:
         /**
@@ -53,59 +52,30 @@ class AnimatedSprite
         static AnimatedSprite *load(const std::string &filename,
                                     int variant = 0);
 
-        /**
-         * Destructor.
-         */
         virtual ~AnimatedSprite();
 
-        /**
-         * Resets the animated sprite.
-         */
-        void reset();
+        bool reset();
 
-        /**
-         * Plays an action using the current direction
-         */
-        void play(SpriteAction action);
+        bool play(std::string action);
 
-        /**
-         * Inform the animation of the passed time so that it can output the
-         * correct animation frame.
-         */
-        void update(int time);
+        bool update(int time);
 
-        /**
-         * Draw the current animation frame at the coordinates given in screen
-         * pixels.
-         */
         bool draw(Graphics* graphics, int posX, int posY) const;
 
-        /**
-         * gets the width in pixels of the image of the current frame
-         */
         int getWidth() const;
 
-        /**
-         * gets the height in pixels of the image of the current frame
-         */
         int getHeight() const;
 
-        /**
-         * Sets the direction.
-         */
-        void setDirection(SpriteDirection direction);
+        const Image* getImage() const;
 
-        /**
-         * Sets the alpha value of the animated sprite
-         */
-        void setAlpha(float alpha)
-        { mAlpha = alpha; }
+        bool setDirection(SpriteDirection direction);
 
-        /**
-         * Returns the current alpha opacity of the animated sprite.
-         */
-        virtual float getAlpha() const
-        { return mAlpha; }
+        int getNumberOfLayers()
+        { return 1; }
+
+        size_t getCurrentFrame() const;
+
+        size_t getFrameCount() const;
 
     private:
         bool updateCurrentAnimation(unsigned int dt);
@@ -120,7 +90,6 @@ class AnimatedSprite
         Action *mAction;               /**< The currently active action. */
         Animation *mAnimation;         /**< The currently active animation. */
         Frame *mFrame;                 /**< The currently active frame. */
-        float mAlpha;                  /**< The alpha opacity used to draw */
 };
 
 #endif
diff --git a/src/avatar.cpp b/src/avatar.cpp
index f11bf535..b47333b6 100644
--- a/src/avatar.cpp
+++ b/src/avatar.cpp
@@ -20,10 +20,6 @@
 
 #include "avatar.h"
 
-#include "localplayer.h"
-
-#include <sstream>
-
 Avatar::Avatar(const std::string &name):
         mName(name),
         mHp(0), mMaxHp(0),
diff --git a/src/being.cpp b/src/being.cpp
index be8afa79..4d682ab8 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -21,104 +21,156 @@
 
 #include "being.h"
 
+#include "actorspritemanager.h"
 #include "animatedsprite.h"
 #include "client.h"
 #include "configuration.h"
 #include "effectmanager.h"
+#include "event.h"
 #include "graphics.h"
+#include "guild.h"
 #include "localplayer.h"
 #include "log.h"
 #include "map.h"
 #include "particle.h"
+#include "party.h"
+#include "playerrelations.h"
 #include "simpleanimation.h"
 #include "sound.h"
 #include "text.h"
-#include "statuseffect.h"
 
 #include "gui/gui.h"
+#include "gui/socialwindow.h"
 #include "gui/speechbubble.h"
-#include "gui/theme.h"
-#include "gui/userpalette.h"
 
+#include "net/charhandler.h"
+#include "net/gamehandler.h"
+#include "net/net.h"
+#include "net/playerhandler.h"
+#include "net/npchandler.h"
+
+#include "resources/beinginfo.h"
 #include "resources/colordb.h"
 #include "resources/emotedb.h"
 #include "resources/image.h"
 #include "resources/itemdb.h"
 #include "resources/iteminfo.h"
-#include "resources/resourcemanager.h"
+#include "resources/monsterdb.h"
+#include "resources/npcdb.h"
+#include "resources/theme.h"
+#include "resources/userpalette.h"
 
-
-#include "utils/dtor.h"
 #include "utils/stringutils.h"
-#include "utils/xml.h"
-#include "net/net.h"
-#include "net/playerhandler.h"
 
 #include <cassert>
 #include <cmath>
 
-#define BEING_EFFECTS_FILE "effects.xml"
 #define HAIR_FILE "hair.xml"
 
 static const int DEFAULT_BEING_WIDTH = 32;
 static const int DEFAULT_BEING_HEIGHT = 32;
-
-
 int Being::mNumberOfHairstyles = 1;
 
 // TODO: mWalkTime used by eAthena only
-Being::Being(int id, int subtype, Map *map):
-    mFrame(0),
-    mWalkTime(0),
-    mEmotion(0), mEmotionTime(0),
+Being::Being(int id, Type type, int subtype, Map *map):
+    ActorSprite(id),
+    mInfo(BeingInfo::Unknown),
+    mActionTime(0),
     mSpeechTime(0),
+    mAttackType(1),
     mAttackSpeed(350),
     mAction(STAND),
-    mSubType(subtype),
-    mId(id),
+    mSubType(0xFFFF),
     mDirection(DOWN),
     mSpriteDirection(DIRECTION_DOWN),
-    mMap(NULL),
     mDispName(0),
     mShowName(false),
     mEquippedWeapon(NULL),
     mText(0),
-    mStunMode(0),
-    mAlpha(1.0f),
-    mStatusParticleEffects(&mStunParticleEffects, false),
-    mChildParticleEffects(&mStatusParticleEffects, false),
-    mMustResetParticles(false),
+    mGender(GENDER_UNSPECIFIED),
+    mParty(NULL),
+    mIsGM(false),
+    mType(type),
     mX(0), mY(0),
     mDamageTaken(0),
-    mUsedTargetCursor(NULL)
+    mIp(0)
 {
     setMap(map);
+    setSubtype(subtype);
 
     mSpeechBubble = new SpeechBubble;
 
-    mNameColor = &userPalette->getColor(UserPalette::NPC);
-    mTextColor = &Theme::getThemeColor(Theme::CHAT);
     mWalkSpeed = Net::getPlayerHandler()->getDefaultWalkSpeed();
-}
 
-Being::~Being()
-{
-    mUsedTargetCursor = NULL;
-    delete_all(mSprites);
+    if (getType() == PLAYER)
+        mShowName = config.getBoolValue("visiblenames");
 
-    if (player_node && player_node->getTarget() == this)
-        player_node->setTarget(NULL);
+    if (getType() == PLAYER || getType() == NPC)
+        setShowName(true);
 
-    setMap(NULL);
+    updateColors();
+    listen(CHANNEL_CONFIG);
+    listen(CHANNEL_CHAT);
+}
 
+Being::~Being()
+{
     delete mSpeechBubble;
     delete mDispName;
     delete mText;
+    mSpeechBubble = 0;
+    mDispName = 0;
+    mText = 0;
+}
+
+void Being::setSubtype(Uint16 subtype)
+{
+    if (subtype == mSubType)
+        return;
+
+    mSubType = subtype;
+
+    if (getType() == MONSTER)
+    {
+        mInfo = MonsterDB::get(mSubType);
+        setName(mInfo->getName());
+        setupSpriteDisplay(mInfo->getDisplay());
+    }
+    else if (getType() == NPC)
+    {
+        mInfo = NPCDB::get(mSubType);
+        setupSpriteDisplay(mInfo->getDisplay(), false);
+    }
+    else if (getType() == PLAYER)
+    {
+        int id = -100 - subtype;
+
+        // Prevent showing errors when sprite doesn't exist
+        if (!itemDb->exists(id))
+            id = -100;
+
+        setSprite(Net::getCharHandler()->baseSprite(), id);
+    }
+}
+
+ActorSprite::TargetCursorSize Being::getTargetCursorSize() const
+{
+    return mInfo->getTargetCursorSize();
+}
+
+unsigned char Being::getWalkMask() const
+{
+    return mInfo->getWalkMask();
+}
+
+Map::BlockType Being::getBlockType() const
+{
+    return mInfo->getBlockType();
 }
 
 void Being::setPosition(const Vector &pos)
 {
-    mPos = pos;
+    Actor::setPosition(pos);
 
     updateCoords();
 
@@ -152,8 +204,9 @@ void Being::setDestination(int dstX, int dstY)
 
     Position dest = mMap->checkNodeOffsets(getCollisionRadius(), getWalkMask(),
                                            dstX, dstY);
-    Path thisPath = mMap->findPixelPath(mPos.x, mPos.y, dest.x, dest.y,
-                                   getCollisionRadius(), getWalkMask());
+    Path thisPath = mMap->findPixelPath((int) mPos.x, (int) mPos.y,
+                                        dest.x, dest.y,
+                                        getCollisionRadius(), getWalkMask());
 
     if (thisPath.empty())
     {
@@ -186,10 +239,10 @@ void Being::setPath(const Path &path)
     mPath = path;
 
     if ((Net::getNetworkType() == ServerInfo::TMWATHENA) &&
-            mAction != WALK && mAction != DEAD)
+            mAction != MOVE && mAction != DEAD)
     {
         nextTile();
-        mWalkTime = tick_time;
+        mActionTime = tick_time;
     }
 }
 
@@ -235,7 +288,7 @@ void Being::setSpeech(const std::string &text, int time)
     if (!mSpeech.empty())
         mSpeechTime = time <= SPEECH_MAX_TIME ? time : SPEECH_MAX_TIME;
 
-    const int speech = (int) config.getValue("speech", TEXT_OVERHEAD);
+    const int speech = config.getIntValue("speech");
     if (speech == TEXT_OVERHEAD)
     {
         if (mText)
@@ -309,6 +362,19 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type)
 
     if (amount > 0)
     {
+        if (mInfo)
+        {
+            if (attacker)
+            {
+                sound.playSfx(mInfo->getSound(SOUND_EVENT_HURT),
+                              attacker->getTileX(), attacker->getTileY());
+            }
+            else
+            {
+                sound.playSfx(mInfo->getSound(SOUND_EVENT_HURT));
+            }
+        }
+
         if (getType() == MONSTER)
         {
             mDamageTaken += amount;
@@ -327,76 +393,159 @@ void Being::handleAttack(Being *victim, int damage, AttackType type)
     if (this != player_node)
         setAction(Being::ATTACK, 1);
 
-    if (getType() == PLAYER && victim)
-    {
-        if (mEquippedWeapon)
-        {
-            fireMissile(victim, mEquippedWeapon->getMissileParticle());
-        }
-    }
+    if (getType() == PLAYER && victim && mEquippedWeapon)
+        fireMissile(victim, mEquippedWeapon->getMissileParticle());
+    else
+        fireMissile(victim, mInfo->getAttack(mAttackType)->missileParticle);
+
     if (Net::getNetworkType() == ServerInfo::TMWATHENA)
     {
-        mFrame = 0;
-        mWalkTime = tick_time;
+        reset();
+        mActionTime = tick_time;
     }
+
+    sound.playSfx(mInfo->getSound((damage > 0) ?
+                  SOUND_EVENT_HIT : SOUND_EVENT_MISS), mX, mY);
 }
 
 void Being::setName(const std::string &name)
 {
-    mName = name;
-
-    if (getShowName())
+    if (getType() == NPC)
+    {
+        mName = name.substr(0, name.find('#', 0));
         showName();
+    }
+    else
+    {
+        mName = name;
+
+        if (getType() == PLAYER && getShowName())
+            showName();
+    }
 }
 
 void Being::setShowName(bool doShowName)
 {
-    bool oldShow = mShowName;
+    if (mShowName == doShowName)
+        return;
+
     mShowName = doShowName;
 
-    if (doShowName != oldShow)
+    if (doShowName)
+        showName();
+    else
     {
-        if (doShowName)
-            showName();
-        else
-        {
-            delete mDispName;
-            mDispName = 0;
-        }
+        delete mDispName;
+        mDispName = 0;
     }
 }
 
 void Being::setGuildName(const std::string &name)
 {
-    logger->log("Got guild name \"%s\" for being %s(%i)", name.c_str(), mName.c_str(), mId);
+    logger->log("Got guild name \"%s\" for being %s(%i)", name.c_str(),
+                mName.c_str(), mId);
 }
 
 
 void Being::setGuildPos(const std::string &pos)
 {
-    logger->log("Got guild position \"%s\" for being %s(%i)", pos.c_str(), mName.c_str(), mId);
+    logger->log("Got guild position \"%s\" for being %s(%i)", pos.c_str(),
+                mName.c_str(), mId);
 }
 
-void Being::setMap(Map *map)
+void Being::addGuild(Guild *guild)
 {
-    // Remove sprite from potential previous map
-    if (mMap)
-        mMap->removeSprite(mMapSprite);
+    mGuilds[guild->getId()] = guild;
+    guild->addMember(mId, mName);
 
-    mMap = map;
+    if (this == player_node && socialWindow)
+    {
+        socialWindow->addTab(guild);
+    }
+}
 
-    // Add sprite to potential new map
-    if (mMap)
-        mMapSprite = mMap->addSprite(this);
+void Being::removeGuild(int id)
+{
+    if (this == player_node && socialWindow)
+    {
+        socialWindow->removeTab(mGuilds[id]);
+    }
 
-    // Clear particle effect list because child particles became invalid
-    mChildParticleEffects.clear();
-    mMustResetParticles = true; // Reset status particles on next redraw
+    mGuilds[id]->removeMember(mId);
+    mGuilds.erase(id);
 }
 
-void Being::controlParticle(Particle *particle)
+Guild *Being::getGuild(const std::string &guildName) const
 {
-    mChildParticleEffects.addLocally(particle);
+    std::map<int, Guild*>::const_iterator itr, itr_end = mGuilds.end();
+    for (itr = mGuilds.begin(); itr != itr_end; ++itr)
+    {
+        Guild *guild = itr->second;
+        if (guild->getName() == guildName)
+        {
+            return guild;
+        }
+    }
+
+    return NULL;
+}
+
+Guild *Being::getGuild(int id) const
+{
+    std::map<int, Guild*>::const_iterator itr;
+    itr = mGuilds.find(id);
+    if (itr != mGuilds.end())
+    {
+        return itr->second;
+    }
+
+    return NULL;
+}
+
+void Being::clearGuilds()
+{
+    std::map<int, Guild*>::const_iterator itr, itr_end = mGuilds.end();
+    for (itr = mGuilds.begin(); itr != itr_end; ++itr)
+    {
+        Guild *guild = itr->second;
+
+        if (this == player_node && socialWindow)
+            socialWindow->removeTab(guild);
+
+        guild->removeMember(mId);
+    }
+
+    mGuilds.clear();
+}
+
+void Being::setParty(Party *party)
+{
+    if (party == mParty)
+        return;
+
+    Party *old = mParty;
+    mParty = party;
+
+    if (old)
+    {
+        old->removeMember(mId);
+    }
+
+    if (party)
+    {
+        party->addMember(mId, mName);
+    }
+
+    updateColors();
+
+    if (this == player_node && socialWindow)
+    {
+        if (old)
+            socialWindow->removeTab(old);
+
+        if (party)
+            socialWindow->addTab(party);
+    }
 }
 
 void Being::fireMissile(Being *victim, const std::string &particle)
@@ -404,63 +553,98 @@ void Being::fireMissile(Being *victim, const std::string &particle)
     if (!victim || particle.empty())
         return;
 
-    Particle *target = particleEngine->createChild();
-    Particle *missile = target->addEffect(particle, getPixelX(), getPixelY());
+    Particle *missile = particleEngine->addEffect(particle,
+                                                  getPixelX(), getPixelY());
 
     if (missile)
     {
-        target->setLifetime(2000);
+        Particle *target = particleEngine->createChild();
         target->moveBy(Vector(0.0f, 0.0f, 32.0f));
+        target->setLifetime(1000);
         victim->controlParticle(target);
 
         missile->setDestination(target, 7, 0);
         missile->setDieDistance(8);
         missile->setLifetime(900);
     }
+
 }
 
 void Being::setAction(Action action, int attackType)
 {
-    SpriteAction currentAction = ACTION_INVALID;
+    std::string currentAction = SpriteAction::INVALID;
 
     switch (action)
     {
-        case WALK:
-            currentAction = ACTION_WALK;
+        case MOVE:
+            currentAction = SpriteAction::MOVE;
+            // Note: When adding a run action,
+            // Differentiate walk and run with action name,
+            // while using only the ACTION_MOVE.
             break;
         case SIT:
-            currentAction = ACTION_SIT;
+            currentAction = SpriteAction::SIT;
             break;
         case ATTACK:
             if (mEquippedWeapon)
-                currentAction = mEquippedWeapon->getAttackType();
+            {
+                currentAction = mEquippedWeapon->getAttackAction();
+                reset();
+            }
             else
-                currentAction = ACTION_ATTACK;
+            {
+                mAttackType = attackType;
+                currentAction = mInfo->getAttack(attackType)->action;
+                reset();
+
+                if (Net::getNetworkType() == ServerInfo::MANASERV)
+                {
+                    int rotation = 0;
+                    //attack particle effect
+                    std::string particleEffect = mInfo->getAttack(attackType)
+                                                 ->particleEffect;
+                    if (!particleEffect.empty() && Particle::enabled)
+                    {
+                        switch (mSpriteDirection)
+                        {
+                            case DIRECTION_DOWN: rotation = 0; break;
+                            case DIRECTION_LEFT: rotation = 90; break;
+                            case DIRECTION_UP: rotation = 180; break;
+                            case DIRECTION_RIGHT: rotation = 270; break;
+                            default: break;
+                        }
+                        Particle *p;
+                        p = particleEngine->addEffect(particleEffect, 0, 0,
+                                                      rotation);
+                        controlParticle(p);
+                    }
+                }
+            }
 
-            for (SpriteIterator it = mSprites.begin(); it != mSprites.end(); it++)
-                if (*it)
-                    (*it)->reset();
             break;
         case HURT:
-            //currentAction = ACTION_HURT;  // Buggy: makes the player stop
+            //currentAction = SpriteAction::HURT;// Buggy: makes the player stop
                                             // attacking and unable to attack
-                                            // again until he moves
+                                            // again until he moves.
+                                            // TODO: fix this!
             break;
         case DEAD:
-            currentAction = ACTION_DEAD;
+            currentAction = SpriteAction::DEAD;
+            sound.playSfx(mInfo->getSound(SOUND_EVENT_DIE), mX, mY);
             break;
         case STAND:
-            currentAction = ACTION_STAND;
+            currentAction = SpriteAction::STAND;
             break;
     }
 
-    if (currentAction != ACTION_INVALID)
+    if (currentAction != SpriteAction::INVALID)
     {
-        for (SpriteIterator it = mSprites.begin(); it != mSprites.end(); it++)
-            if (*it)
-                (*it)->play(currentAction);
+        play(currentAction);
         mAction = action;
     }
+
+    if (currentAction != SpriteAction::MOVE)
+        mActionTime = tick_time;
 }
 
 void Being::setDirection(Uint8 direction)
@@ -484,12 +668,10 @@ void Being::setDirection(Uint8 direction)
         dir = DIRECTION_LEFT;
     mSpriteDirection = dir;
 
-    for (SpriteIterator it = mSprites.begin(); it != mSprites.end(); it++)
-        if (*it)
-           (*it)->setDirection(dir);
+    CompoundSprite::setDirection(dir);
 }
 
-/** TODO: Used by eAthena only */
+/** Note: Used by Tmw-Athena only */
 void Being::nextTile()
 {
     if (mPath.empty())
@@ -521,8 +703,8 @@ void Being::nextTile()
 
     mX = pos.x;
     mY = pos.y;
-    setAction(WALK);
-    mWalkTime += (int)(mWalkSpeed.x / 10);
+    setAction(MOVE);
+    mActionTime += (int)(mWalkSpeed.x / 10);
 }
 
 int Being::getCollisionRadius() const
@@ -544,24 +726,32 @@ void Being::logic()
         mText = 0;
     }
 
-    if ((Net::getNetworkType() == ServerInfo::MANASERV) && (mAction != DEAD))
+    if ((Net::getNetworkType() == ServerInfo::MANASERV) && (mAction != DEAD)
+        && !mWalkSpeed.isNull())
     {
         const Vector dest = (mPath.empty()) ?
             mDest : Vector(mPath.front().x,
                            mPath.front().y);
 
-        // This is a hack that stops NPCs from running off the map...
+        // Avoid going to flawed destinations
         if (mDest.x <= 0 && mDest.y <= 0)
+        {
+            // We make the being stop move in that case.
+            mDest = mPos;
+            mPath.clear();
+            // By returning now, we're losing one tick for the rest of the logic
+            // but as we have reset the destination, the next tick will be fine.
             return;
+        }
 
         // The Vector representing the difference between current position
         // and the next destination path node.
         Vector dir = dest - mPos;
 
-        const float nominalLength = dir.length();
+        float distance = dir.length();
 
         // When we've not reached our destination, move to it.
-        if (nominalLength > 0.0f && !mWalkSpeed.isNull())
+        if (distance > 0.0f)
         {
             // The deplacement of a point along a vector is calculated
             // using the Unit Vector (â) multiplied by the point speed.
@@ -572,7 +762,7 @@ void Being::logic()
                         normalizedDir.y * mWalkSpeed.y);
 
             // Test if we don't miss the destination by a move too far:
-            if (diff.length() > nominalLength)
+            if (diff.length() > distance)
             {
                 setPosition(mPos + dir);
 
@@ -581,32 +771,43 @@ void Being::logic()
                 if (!mPath.empty())
                     mPath.pop_front();
             }
-            // Otherwise, go to it using the nominal speed.
             else
+            {
+                // Otherwise, go to it using the nominal speed.
                 setPosition(mPos + diff);
+                // And reset the nominalLength to the actual move length
+                distance = diff.length();
+            }
 
-            if (mAction != WALK)
-                setAction(WALK);
+            if (mAction != MOVE)
+                setAction(MOVE);
 
             // Update the player sprite direction.
-            // N.B.: We only change this if the distance is more than one pixel.
-            if (nominalLength > 1.0f)
+            // N.B.: We only change this if the distance is more than one pixel
+            // to avoid flawing the ending direction.
+            if (distance > 1.0f)
             {
-                int direction = 0;
-                const float dx = std::abs(dir.x);
-                float dy = std::abs(dir.y);
-
-                // When not using mouse for the player, we slightly prefer
-                // UP and DOWN position, especially when walking diagonally.
-                if (this == player_node && !player_node->isPathSetByMouse())
-                    dy = dy + 2;
-
-                if (dx > dy)
-                     direction |= (dir.x > 0) ? RIGHT : LEFT;
-                else
-                     direction |= (dir.y > 0) ? DOWN : UP;
-
-                setDirection(direction);
+                // The player direction is handled for keyboard
+                // by LocalPlayer::startWalking(), we shouldn't get
+                // in the way here for other cases.
+                // Hence, we set the direction in Being::logic() only when:
+                // 1. It is not the localPlayer
+                // 2. When it is the localPlayer but only by mouse
+                // (because in that case, the path can have more than one tile.)
+                if ((player_node == this && player_node->isPathSetByMouse())
+                    || player_node != this)
+                {
+                    int direction = 0;
+                    const float dx = std::abs(dir.x);
+                    float dy = std::abs(dir.y);
+
+                    if (dx > dy)
+                        direction |= (dir.x > 0) ? RIGHT : LEFT;
+                    else
+                        direction |= (dir.y > 0) ? DOWN : UP;
+
+                    setDirection(direction);
+                }
             }
         }
         else if (!mPath.empty())
@@ -615,108 +816,101 @@ void Being::logic()
             // remove it and go to the next one.
             mPath.pop_front();
         }
-        else if (mAction == WALK)
+        else if (mAction == MOVE)
         {
             setAction(STAND);
         }
     }
     else if (Net::getNetworkType() == ServerInfo::TMWATHENA)
     {
-        // Update pixel coordinates
-        setPosition(mX * 32 + 16 + getXOffset(),
-                    mY * 32 + 32 + getYOffset());
-    }
-
-    if (mEmotion != 0)
-    {
-        mEmotionTime--;
-        if (mEmotionTime == 0)
-            mEmotion = 0;
-    }
-
-    // Update sprite animations
-    if (mUsedTargetCursor)
-        mUsedTargetCursor->update(tick_time * MILLISECONDS_IN_A_TICK);
-
-    for (SpriteIterator it = mSprites.begin(); it != mSprites.end(); it++)
-        if (*it)
-            (*it)->update(tick_time * MILLISECONDS_IN_A_TICK);
+        int frameCount = getFrameCount();
 
-    // Restart status/particle effects, if needed
-    if (mMustResetParticles)
-    {
-        mMustResetParticles = false;
-        for (std::set<int>::iterator it = mStatusEffects.begin();
-             it != mStatusEffects.end(); it++)
+        switch (mAction)
         {
-            const StatusEffect *effect = StatusEffect::getStatusEffect(*it, true);
-            if (effect && effect->particleEffectIsPersistent())
-                updateStatusEffect(*it, true);
+            case STAND:
+            case SIT:
+            case DEAD:
+            case HURT:
+               break;
+
+            case MOVE:
+                if ((int) ((get_elapsed_time(mActionTime) * frameCount)
+                        / getWalkSpeed().x) >= frameCount)
+                    nextTile();
+                break;
+
+            case ATTACK:
+                int rotation = 0;
+                std::string particleEffect = "";
+
+                int curFrame = (get_elapsed_time(mActionTime) * frameCount)
+                               / mAttackSpeed;
+
+                //attack particle effect
+                if (mEquippedWeapon)
+                {
+                    particleEffect = mEquippedWeapon->getParticleEffect();
+
+                    if (!particleEffect.empty() &&
+                        findSameSubstring(particleEffect,
+                                     paths.getStringValue("particles")).empty())
+                        particleEffect = paths.getStringValue("particles")
+                                         + particleEffect;
+                }
+                else
+                {
+                    particleEffect = mInfo->getAttack(mAttackType)
+                                             ->particleEffect;
+                }
+
+                if (!particleEffect.empty() && Particle::enabled
+                    && curFrame == 1)
+                {
+                    switch (mDirection)
+                    {
+                        case DOWN: rotation = 0; break;
+                        case LEFT: rotation = 90; break;
+                        case UP: rotation = 180; break;
+                        case RIGHT: rotation = 270; break;
+                        default: break;
+                    }
+                    Particle *p;
+                    p = particleEngine->addEffect(particleEffect, 0, 0,
+                                                  rotation);
+                    controlParticle(p);
+                }
+
+                if (curFrame >= frameCount)
+                    nextTile();
+
+                break;
         }
-    }
-
-    // Update particle effects
-    mChildParticleEffects.moveTo(mPos.x, mPos.y);
-}
 
-void Being::draw(Graphics *graphics, int offsetX, int offsetY) const
-{
-    // TODO: Eventually, we probably should fix all sprite offsets so that
-    //       these translations aren't necessary anymore. The sprites know
-    //       best where their base point should be.
-    const int px = getPixelX() + offsetX - 16;
-    // Temporary fix to the Y offset.
-    const int py = getPixelY() + offsetY -
-        ((Net::getNetworkType() == ServerInfo::MANASERV) ? 15 : 32);
-
-    if (mUsedTargetCursor)
-        mUsedTargetCursor->draw(graphics, px, py);
-
-    for (SpriteConstIterator it = mSprites.begin(); it != mSprites.end(); it++)
-    {
-        if (*it)
-        {
-            if ((*it)->getAlpha() != mAlpha)
-                (*it)->setAlpha(mAlpha);
-            (*it)->draw(graphics, px, py);
-        }
+        // Update pixel coordinates
+        setPosition(mX * 32 + 16 + getXOffset(),
+                    mY * 32 + 32 + getYOffset());
     }
-}
 
-void Being::drawSpriteAt(Graphics *graphics, int x, int y) const
-{
-    const int px = x - 16;
-    const int py = y - 32;
+    ActorSprite::logic();
+
+    int frameCount = getFrameCount();
+    if (frameCount < 10)
+        frameCount = 10;
 
-    for (SpriteConstIterator it = mSprites.begin(); it != mSprites.end(); it++)
+    if (!isAlive() && Net::getGameHandler()->removeDeadBeings() &&
+        (int) ((get_elapsed_time(mActionTime)
+                / getWalkSpeed().x) >= frameCount))
     {
-        if (*it)
-        {
-            if ((*it)->getAlpha() != mAlpha)
-                (*it)->setAlpha(mAlpha);
-            (*it)->draw(graphics, px, py);
-        }
+        if (getType() != PLAYER)
+            actorSpriteManager->destroy(this);
     }
 }
 
-void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
-{
-    if (!mEmotion)
-        return;
-
-    const int px = getPixelX() - offsetX - 16;
-    const int py = getPixelY() - offsetY - 64 - 32;
-    const int emotionIndex = mEmotion - 1;
-
-    if (emotionIndex >= 0 && emotionIndex <= EmoteDB::getLast())
-        EmoteDB::getAnimation(emotionIndex)->draw(graphics, px, py);
-}
-
 void Being::drawSpeech(int offsetX, int offsetY)
 {
     const int px = getPixelX() - offsetX;
     const int py = getPixelY() - offsetY;
-    const int speech = (int) config.getValue("speech", TEXT_OVERHEAD);
+    const int speech = config.getIntValue("speech");
 
     // Draw speech above this being
     if (mSpeechTime == 0)
@@ -766,72 +960,11 @@ void Being::drawSpeech(int offsetX, int offsetY)
     }
 }
 
-void Being::setStatusEffectBlock(int offset, Uint16 newEffects)
-{
-    for (int i = 0; i < STATUS_EFFECTS; i++)
-    {
-        int index = StatusEffect::blockEffectIndexToEffectIndex(offset + i);
-
-        if (index != -1)
-            setStatusEffect(index, (newEffects & (1 << i)) > 0);
-    }
-}
-
-void Being::handleStatusEffect(StatusEffect *effect, int effectId)
-{
-    if (!effect)
-        return;
-
-    // TODO: Find out how this is meant to be used
-    // (SpriteAction != Being::Action)
-    //SpriteAction action = effect->getAction();
-    //if (action != ACTION_INVALID)
-    //    setAction(action);
-
-    Particle *particle = effect->getParticle();
-
-    if (effectId >= 0)
-    {
-        mStatusParticleEffects.setLocally(effectId, particle);
-    }
-    else
-    {
-        mStunParticleEffects.clearLocally();
-        if (particle)
-            mStunParticleEffects.addLocally(particle);
-    }
-}
-
-void Being::updateStunMode(int oldMode, int newMode)
-{
-    handleStatusEffect(StatusEffect::getStatusEffect(oldMode, false), -1);
-    handleStatusEffect(StatusEffect::getStatusEffect(newMode, true), -1);
-}
-
-void Being::updateStatusEffect(int index, bool newStatus)
-{
-    handleStatusEffect(StatusEffect::getStatusEffect(index, newStatus), index);
-}
-
-void Being::setStatusEffect(int index, bool active)
-{
-    const bool wasActive = mStatusEffects.find(index) != mStatusEffects.end();
-
-    if (active != wasActive)
-    {
-        updateStatusEffect(index, active);
-        if (active)
-            mStatusEffects.insert(index);
-        else
-            mStatusEffects.erase(index);
-    }
-}
-
-/** TODO: eAthena only */
+/** Note: Used by Tmw-Athena only */
 int Being::getOffset(char pos, char neg) const
 {
     // Check whether we're walking in the requested direction
-    if (mAction != WALK ||  !(mDirection & (pos | neg)))
+    if (mAction != MOVE ||  !(mDirection & (pos | neg)))
         return 0;
 
     int offset = 0;
@@ -839,9 +972,9 @@ int Being::getOffset(char pos, char neg) const
     if (mMap)
     {
         offset = (pos == LEFT && neg == RIGHT) ?
-                 (int)((get_elapsed_time(mWalkTime)
+                 (int)((get_elapsed_time(mActionTime)
                         * mMap->getTileWidth()) / mWalkSpeed.x) :
-                 (int)((get_elapsed_time(mWalkTime)
+                 (int)((get_elapsed_time(mActionTime)
                         * mMap->getTileHeight()) / mWalkSpeed.y);
     }
 
@@ -859,181 +992,185 @@ int Being::getOffset(char pos, char neg) const
 
 int Being::getWidth() const
 {
-    AnimatedSprite *base = NULL;
-
-    for (SpriteConstIterator it = mSprites.begin(); it != mSprites.end(); it++)
-        if ((base = (*it)))
-            break;
-
-    if (base)
-        return std::max(base->getWidth(), DEFAULT_BEING_WIDTH);
-
-    return DEFAULT_BEING_WIDTH;
+    return std::max(CompoundSprite::getWidth(), DEFAULT_BEING_WIDTH);
 }
 
 int Being::getHeight() const
 {
-    AnimatedSprite *base = NULL;
-
-    for (SpriteConstIterator it = mSprites.begin(); it != mSprites.end(); it++)
-        if ((base = (*it)))
-            break;
-
-    if (base)
-        return std::max(base->getHeight(), DEFAULT_BEING_HEIGHT);
-
-    return DEFAULT_BEING_HEIGHT;
+    return std::max(CompoundSprite::getHeight(), DEFAULT_BEING_HEIGHT);
 }
 
-void Being::setTargetAnimation(SimpleAnimation *animation)
+void Being::updateCoords()
 {
-    mUsedTargetCursor = animation;
-    mUsedTargetCursor->reset();
-}
-
-struct EffectDescription {
-    std::string mGFXEffect;
-    std::string mSFXEffect;
-};
+    if (!mDispName)
+        return;
 
-static EffectDescription *default_effect = NULL;
-static std::map<int, EffectDescription *> effects;
-static bool effects_initialized = false;
+    // Monster names show above the sprite instead of below it
+    if (getType() == MONSTER)
+        mDispName->adviseXY(getPixelX(),
+                getPixelY() - getHeight() - mDispName->getHeight());
+    else
+        mDispName->adviseXY(getPixelX(), getPixelY());
+}
 
-static EffectDescription *getEffectDescription(xmlNodePtr node, int *id)
+void Being::flashName(int time)
 {
-    EffectDescription *ed = new EffectDescription;
-
-    *id = atoi(XML::getProperty(node, "id", "-1").c_str());
-    ed->mSFXEffect = XML::getProperty(node, "audio", "");
-    ed->mGFXEffect = XML::getProperty(node, "particle", "");
-
-    return ed;
+    if (mDispName)
+        mDispName->flash(time);
 }
 
-static EffectDescription *getEffectDescription(int effectId)
+void Being::showName()
 {
-    if (!effects_initialized)
-    {
-        XML::Document doc(BEING_EFFECTS_FILE);
-        xmlNodePtr root = doc.rootNode();
+    delete mDispName;
+    mDispName = 0;
+    std::string mDisplayName(mName);
 
-        if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects"))
+    Being* player =  static_cast<Being*>(this);
+    if (player)
+    {
+        if (config.getBoolValue("showgender"))
         {
-            logger->log("Error loading being effects file: "
-                    BEING_EFFECTS_FILE);
-            return NULL;
+            if (getGender() == GENDER_FEMALE)
+                mDisplayName += " \u2640";
+            else if (getGender() == GENDER_MALE)
+                mDisplayName += " \u2642";
         }
 
-        for_each_xml_child_node(node, root)
+        // Display the IP when under tmw-Athena (GM only).
+        if (Net::getNetworkType() == ServerInfo::TMWATHENA && player_node
+        && player_node->getShowIp() && player->getIp())
         {
-            int id;
-
-            if (xmlStrEqual(node->name, BAD_CAST "effect"))
-            {
-                EffectDescription *EffectDescription =
-                    getEffectDescription(node, &id);
-                effects[id] = EffectDescription;
-            }
-            else if (xmlStrEqual(node->name, BAD_CAST "default"))
-            {
-                EffectDescription *effectDescription =
-                    getEffectDescription(node, &id);
-
-                if (default_effect)
-                    delete default_effect;
+            mDisplayName += strprintf(" %s", ipToString(player->getIp()));
+        }
+    }
 
-                default_effect = effectDescription;
-            }
+    if (getType() == MONSTER)
+    {
+        if (config.getBoolValue("showMonstersTakedDamage"))
+        {
+            mDisplayName += ", " + toString(getDamageTaken());
         }
+    }
 
-        effects_initialized = true;
-    } // done initializing
+    gcn::Font *font = 0;
+    if (player_node && player_node->getTarget() == this
+        && getType() != MONSTER)
+    {
+        font = boldFont;
+    }
 
-    EffectDescription *ed = effects[effectId];
+    mDispName = new FlashText(mDisplayName, getPixelX(), getPixelY(),
+                              gcn::Graphics::CENTER, mNameColor, font);
 
-    return ed ? ed : default_effect;
+    updateCoords();
 }
 
-void Being::internalTriggerEffect(int effectId, bool sfx, bool gfx)
+void Being::updateColors()
 {
-    logger->log("Special effect #%d on %s", effectId,
-                getId() == player_node->getId() ? "self" : "other");
-
-    EffectDescription *ed = getEffectDescription(effectId);
-
-    if (!ed)
+    if (getType() == MONSTER)
     {
-        logger->log("Unknown special effect and no default recorded");
-        return;
+        mNameColor = &userPalette->getColor(UserPalette::MONSTER);
+        mTextColor = &userPalette->getColor(UserPalette::MONSTER);
     }
-
-    if (gfx && !ed->mGFXEffect.empty())
+    else if (getType() == NPC)
     {
-        Particle *selfFX;
-
-        selfFX = particleEngine->addEffect(ed->mGFXEffect, 0, 0);
-        controlParticle(selfFX);
+        mNameColor = &userPalette->getColor(UserPalette::NPC);
+        mTextColor = &userPalette->getColor(UserPalette::NPC);
     }
+    else if (this == player_node)
+    {
+        mNameColor = &userPalette->getColor(UserPalette::SELF);
+        mTextColor = &Theme::getThemeColor(Theme::PLAYER);
+    }
+    else
+    {
+        mTextColor = &userPalette->getColor(Theme::PLAYER);
 
-    if (sfx && !ed->mSFXEffect.empty())
-        sound.playSfx(ed->mSFXEffect);
-}
+        if (mIsGM)
+        {
+            mTextColor = &userPalette->getColor(UserPalette::GM);
+            mNameColor = &userPalette->getColor(UserPalette::GM);
+        }
+        else if (mParty && mParty == player_node->getParty())
+        {
+            mNameColor = &userPalette->getColor(UserPalette::PARTY);
+        }
+        else
+        {
+            mNameColor = &userPalette->getColor(UserPalette::PC);
+        }
+    }
 
-void Being::updateCoords()
-{
     if (mDispName)
     {
-        mDispName->adviseXY(getPixelX(), getPixelY());
+        mDispName->setColor(mNameColor);
     }
 }
 
-void Being::flashName(int time)
+void Being::setSprite(unsigned int slot, int id, const std::string &color,
+                      bool isWeapon)
 {
-    if (mDispName)
-        mDispName->flash(time);
-}
+    assert(slot < Net::getCharHandler()->maxSprite());
 
-void Being::showName()
-{
-    delete mDispName;
-    mDispName = 0;
-    std::string mDisplayName(mName);
+    if (slot >= size())
+        ensureSize(slot + 1);
 
-    if (getType() == PLAYER)
+    if (slot >= mSpriteIDs.size())
+        mSpriteIDs.resize(slot + 1, 0);
+
+    if (slot >= mSpriteColors.size())
+        mSpriteColors.resize(slot + 1, "");
+
+    // id = 0 means unequip
+    if (id == 0)
     {
-        Player* player =  static_cast<Player*>(this);
-        if (player)
-        {
-            if (config.getValue("showgender", false))
-            {
-                if (player->getGender() == GENDER_FEMALE)
-                    mDisplayName += " \u2640";
-                else
-                    mDisplayName += " \u2642";
-            }
-            if (Net::getNetworkType() == ServerInfo::TMWATHENA && player_node
-                && player_node->getShowIp() && player->getIp())
-            {
-                mDisplayName += strprintf(" %s", ipToString(player->getIp()));
-            }
-        }
+        removeSprite(slot);
+
+        if (isWeapon)
+            mEquippedWeapon = NULL;
     }
-    else if (getType() == MONSTER)
+    else
     {
-        if (config.getValue("showMonstersTakedDamage", false))
+        std::string filename = itemDb->get(id).getSprite(mGender);
+        AnimatedSprite *equipmentSprite = NULL;
+
+        if (!filename.empty())
         {
-            mDisplayName += ", " + toString(getDamageTaken());
+            if (!color.empty())
+                filename += "|" + color;
+
+            equipmentSprite = AnimatedSprite::load(
+                                    paths.getStringValue("sprites") + filename);
         }
+
+        if (equipmentSprite)
+            equipmentSprite->setDirection(getSpriteDirection());
+
+        CompoundSprite::setSprite(slot, equipmentSprite);
+
+        if (isWeapon)
+            mEquippedWeapon = &itemDb->get(id);
+
+        setAction(mAction);
     }
 
-    mDispName = new FlashText(mDisplayName, getPixelX(), getPixelY(),
-                             gcn::Graphics::CENTER, mNameColor);
+    mSpriteIDs[slot] = id;
+    mSpriteColors[slot] = color;
+}
+
+void Being::setSpriteID(unsigned int slot, int id)
+{
+    setSprite(slot, id, mSpriteColors[slot]);
+}
+
+void Being::setSpriteColor(unsigned int slot, const std::string &color)
+{
+    setSprite(slot, mSpriteIDs[slot], color);
 }
 
 int Being::getNumberOfLayers() const
 {
-    return mSprites.size();
+    return CompoundSprite::getNumberOfLayers();
 }
 
 void Being::load()
@@ -1042,8 +1179,8 @@ void Being::load()
     // we can go.
     int hairstyles = 1;
 
-    while (ItemDB::get(-hairstyles).getSprite(GENDER_MALE) !=
-            paths.getValue("spriteErrorFile", "error.xml"))
+    while (itemDb->get(-hairstyles).getSprite(GENDER_MALE) !=
+                                        paths.getStringValue("spriteErrorFile"))
         hairstyles++;
 
     mNumberOfHairstyles = hairstyles;
@@ -1054,3 +1191,64 @@ void Being::updateName()
     if (mShowName)
         showName();
 }
+
+void Being::setGender(Gender gender)
+{
+    if (gender != mGender)
+    {
+        mGender = gender;
+
+        // Reload all subsprites
+        for (unsigned int i = 0; i < mSpriteIDs.size(); i++)
+        {
+            if (mSpriteIDs.at(i) != 0)
+                setSprite(i, mSpriteIDs.at(i), mSpriteColors.at(i));
+        }
+
+        updateName();
+    }
+}
+
+void Being::setGM(bool gm)
+{
+    mIsGM = gm;
+
+    updateColors();
+}
+
+bool Being::canTalk()
+{
+    return mType == NPC;
+}
+
+void Being::talkTo()
+{
+    Net::getNpcHandler()->talk(mId);
+}
+
+void Being::event(Channels channel, const Mana::Event &event)
+{
+    if (channel == CHANNEL_CHAT &&
+            (event.getName() == EVENT_BEING || event.getName() == EVENT_PLAYER) &&
+            event.getInt("permissions") & PlayerRelation::SPEECH_FLOAT)
+    {
+        try
+        {
+            if (mId == event.getInt("beingId"))
+            {
+                setSpeech(event.getString("text"));
+            }
+        }
+        catch (Mana::BadEvent badEvent)
+        {}
+    }
+    else if (channel == CHANNEL_CONFIG &&
+             event.getName() == EVENT_CONFIGOPTIONCHANGED)
+    {
+        if (getType() == PLAYER && event.getString("option") == "visiblenames")
+        {
+            setShowName(config.getBoolValue("visiblenames"));
+        }
+    }
+
+}
diff --git a/src/being.h b/src/being.h
index 71b3e2cf..7f6f8007 100644
--- a/src/being.h
+++ b/src/being.h
@@ -22,19 +22,17 @@
 #ifndef BEING_H
 #define BEING_H
 
-#include "configlistener.h"
+#include "actorsprite.h"
+#include "listener.h"
 #include "map.h"
-#include "particlecontainer.h"
 #include "position.h"
-#include "sprite.h"
 #include "vector.h"
 
-#include "resources/spritedef.h"
-
 #include <guichan/color.hpp>
 
 #include <SDL_types.h>
 
+#include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ -45,31 +43,27 @@
 #define SPEECH_TIME 500
 #define SPEECH_MAX_TIME 1000
 
-class AnimatedSprite;
+class BeingInfo;
 class FlashText;
-class Graphics;
-class Image;
+class Guild;
 class ItemInfo;
 class Item;
 class Particle;
+class Party;
 class Position;
-class SimpleAnimation;
 class SpeechBubble;
 class Text;
 
-class StatusEffect;
+enum Gender
+{
+    GENDER_MALE = 0,
+    GENDER_FEMALE = 1,
+    GENDER_UNSPECIFIED = 2
+};
 
-class Being : public Sprite, public ConfigListener
+class Being : public ActorSprite, public Mana::Listener
 {
     public:
-        enum Type
-        {
-            UNKNOWN,
-            PLAYER,
-            NPC,
-            MONSTER
-        };
-
         /**
          * Action the being is currently performing
          * WARNING: Has to be in sync with the same enum in the Being class
@@ -78,21 +72,13 @@ class Being : public Sprite, public ConfigListener
         enum Action
         {
             STAND,
-            WALK,
+            MOVE,
             ATTACK,
             SIT,
             DEAD,
             HURT
         };
 
-        enum TargetCursorSize
-        {
-            TC_SMALL = 0,
-            TC_MEDIUM,
-            TC_LARGE,
-            NUM_TC
-        };
-
         enum Speech
         {
             NO_SPEECH = 0,
@@ -128,29 +114,27 @@ class Being : public Sprite, public ConfigListener
          * @param subtype partly determines the type of the being
          * @param map     the map the being is on
          */
-        Being(int id, int subtype, Map *map);
+        Being(int id, Type type, int subtype, Map *map);
 
         virtual ~Being();
 
+        Type getType() const { return mType; }
+
         /**
          * Removes all path nodes from this being.
          */
         void clearPath();
 
         /**
-         * Returns the walk time.
-         * Used to know which frame to display and trigger
-         * the next Tile step.
-         * TODO: Used by eAthena only?
+         * Returns the time spent in the current action.
          */
-        int getWalkTime() const { return mWalkTime; }
+        int getActionTime() const { return mActionTime; }
 
         /**
-         * Set the current WalkTime value.
-         * TODO: Used by eAthena only?
+         * Set the current action time.
          * @see Ea::BeingHandler that set it to tick time.
          */
-        void setWalkTime(int walkTime) { mWalkTime = walkTime; }
+        void setActionTime(int actionTime) { mActionTime = actionTime; }
 
         /**
          * Makes this being take the next tile of its path.
@@ -216,7 +200,7 @@ class Being : public Sprite, public ConfigListener
          * @param damage the amount of damage recieved (0 means miss)
          * @param type the attack type
          */
-        virtual void takeDamage(Being *attacker, int damage, AttackType type);
+        void takeDamage(Being *attacker, int damage, AttackType type);
 
         /**
          * Handles an attack of another being by this being.
@@ -238,23 +222,82 @@ class Being : public Sprite, public ConfigListener
          *
          * @param name The name that should appear.
          */
-        virtual void setName(const std::string &name);
+        void setName(const std::string &name);
 
         bool getShowName() const
         { return mShowName; }
 
-        virtual void setShowName(bool doShowName);
+        void setShowName(bool doShowName);
 
         /**
-         * Following are set from the server (mainly for players)
+         * Sets the name of the party the being is in. Shown in BeingPopup.
          */
         void setPartyName(const std::string &name) { mPartyName = name; }
 
         const std::string &getPartyName() const { return mPartyName; }
 
-        virtual void setGuildName(const std::string &name);
+        /**
+         * Sets the name of the primary guild the being is in. Shown in
+         * BeingPopup (eventually).
+         */
+        void setGuildName(const std::string &name);
+
+        void setGuildPos(const std::string &pos);
+
+        /**
+         * Adds a guild to the being.
+         */
+        void addGuild(Guild *guild);
+
+        /**
+         * Removers a guild from the being.
+         */
+        void removeGuild(int id);
+
+        /**
+         * Returns a pointer to the specified guild that the being is in.
+         */
+        Guild *getGuild(const std::string &guildName) const;
+
+        /**
+         * Returns a pointer to the specified guild that the being is in.
+         */
+        Guild *getGuild(int id) const;
+
+        /**
+         * Returns all guilds the being is in.
+         */
+        const std::map<int, Guild*> &getGuilds() const
+        { return mGuilds; }
+
+        /**
+         * Removes all guilds the being is in.
+         */
+        void clearGuilds();
+
+        /**
+         * Get number of guilds the being belongs to.
+         */
+        short getNumberOfGuilds() const
+        { return mGuilds.size(); }
+
+        bool isInParty() const
+        { return mParty != NULL; }
+
+        void setParty(Party *party);
+
+        Party *getParty() const
+        { return mParty; }
 
-        virtual void setGuildPos(const std::string &pos);
+        /**
+         * Sets visible equipments for this being.
+         */
+        void setSprite(unsigned int slot, int id,
+                       const std::string &color = "", bool isWeapon = false);
+
+        void setSpriteID(unsigned int slot, int id);
+
+        void setSpriteColor(unsigned int slot, const std::string &color = "");
 
         /**
          * Get the number of hairstyles implemented
@@ -277,25 +320,27 @@ class Being : public Sprite, public ConfigListener
          */
         void drawSpeech(int offsetX, int offsetY);
 
+        Uint16 getSubType() const { return mSubType; }
+
+         /**
+          * Set Being's subtype (mostly for view for monsters and NPCs)
+          */
+        void setSubtype(Uint16 subtype);
+
+        const BeingInfo *getInfo() const
+        { return mInfo; }
+
+        TargetCursorSize getTargetCursorSize() const;
+
         /**
-         * Draws the emotion picture above the being.
+         * Gets the way the object is blocked by other objects.
          */
-        void drawEmotion(Graphics *graphics, int offsetX, int offsetY);
+        unsigned char getWalkMask() const;
 
         /**
-         * Returns the type of the being.
+         * Gets the way the monster blocks pathfinding for other objects
          */
-        virtual Type getType() const { return UNKNOWN; }
-
-         /**
-          * Return Being's current Job (player job, npc, monster, creature )
-          */
-        Uint16 getSubType() const { return mSubType; }
-
-         /**
-          * Set Being's current Job (player job, npc, monster, creature )
-          */
-        virtual void setSubtype(Uint16 subtype) { mSubType = subtype; }
+        Map::BlockType getBlockType() const;
 
         /**
          * Sets the walk speed.
@@ -324,18 +369,6 @@ class Being : public Sprite, public ConfigListener
         int getAttackSpeed() const { return mAttackSpeed; }
 
         /**
-         * Sets the sprite id.
-         */
-        void setId(int id) { mId = id; }
-
-        int getId() const { return mId; }
-
-        /**
-         * Sets the map the being is on
-         */
-        void setMap(Map *map);
-
-        /**
          * Sets the current action.
          */
         virtual void setAction(Action action, int attackType = 0);
@@ -361,65 +394,11 @@ class Being : public Sprite, public ConfigListener
         void setDirection(Uint8 direction);
 
         /**
-         * Returns the being's current sprite frame number.
-         */
-        int getCurrentFrame() const { return mFrame; }
-
-        /**
-         * Set the being's current sprite frame number.
-         */
-        void setFrame(int frame) { mFrame = frame; }
-
-        /**
          * Returns the direction the being is facing.
          */
         SpriteDirection getSpriteDirection() const
         { return SpriteDirection(mSpriteDirection); }
 
-        /**
-         * Draws this being to the given graphics context.
-         *
-         * @see Sprite::draw(Graphics, int, int)
-         *
-         * TODO: The following two functions should be combined.
-         * at some point draw(), was changed to use mPx and mPy, with arugements
-         * only for the offset, drawSpriteAt() takes x, and y and draws the sprite
-         * exactly at those coords (though it does do some computing to work how the
-         * old draw() worked).
-         */
-        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const;
-
-        virtual void drawSpriteAt(Graphics *graphics, int x, int y) const;
-
-        /**
-         * Set the alpha opacity used to draw the being.
-         */
-        virtual void setAlpha(float alpha)
-        { mAlpha = alpha; }
-
-        /**
-         * Returns the current alpha opacity of the Being.
-         */
-        virtual float getAlpha() const
-        { return mAlpha; }
-
-        /**
-         * Returns the X coordinate in pixels.
-         */
-        int getPixelX() const
-        { return (int) mPos.x; }
-
-        /**
-         * Returns the Y coordinate in pixels.
-         *
-         * @see Sprite::getPixelY()
-         */
-        int getPixelY() const
-        { return (int) mPos.y; }
-
-        /**
-         * Sets the position of this being.
-         */
         void setPosition(const Vector &pos);
 
         /**
@@ -427,17 +406,12 @@ class Being : public Sprite, public ConfigListener
          *
          * @see setPosition(const Vector &pos)
          */
-        void setPosition(float x, float y, float z = 0.0f)
+        inline void setPosition(float x, float y, float z = 0.0f)
         {
             setPosition(Vector(x, y, z));
         }
 
         /**
-         * Returns the position of this being.
-         */
-        const Vector &getPosition() const { return mPos; }
-
-        /**
          * Returns the horizontal size of the current base sprite of the being.
          */
         virtual int getWidth() const;
@@ -453,106 +427,61 @@ class Being : public Sprite, public ConfigListener
         virtual int getCollisionRadius() const;
 
         /**
-         * Returns the required size of a target cursor for this being.
-         */
-        virtual Being::TargetCursorSize getTargetCursorSize() const
-        { return TC_MEDIUM; }
-
-        /**
-         * Take control of a particle.
-         */
-        void controlParticle(Particle *particle);
-
-        /**
          * Shoots a missile particle from this being, to target being
          */
         void fireMissile(Being *target, const std::string &particle);
 
         /**
-         * Gets the way the object is blocked by other objects.
-         */
-        virtual unsigned char getWalkMask() const
-        { return 0x00; } //can walk through everything
-
-        /**
          * Returns the path this being is following. An empty path is returned
          * when this being isn't following any path currently.
          */
         const Path &getPath() const { return mPath; }
 
-        /**
-         * Sets the target animation for this being.
-         */
-        void setTargetAnimation(SimpleAnimation *animation);
+        static void load();
 
-        /**
-         * Untargets the being
-         */
-        void untarget() { mUsedTargetCursor = NULL; }
+        void flashName(int time);
 
+        int getDamageTaken() const
+        { return mDamageTaken; }
+
+        void updateName();
 
         /**
-         * Set the Emoticon type and time displayed above
-         * the being.
+         * Sets the gender of this being.
          */
-        void setEmote(Uint8 emotion, Uint8 emote_time)
-        {
-            mEmotion = emotion;
-            mEmotionTime = emote_time;
-        }
+        virtual void setGender(Gender gender);
+
+        Gender getGender() const
+        { return mGender; }
 
         /**
-         * Get the current Emoticon type displayed above
-         * the being.
+         * Whether or not this player is a GM.
          */
-        Uint8 getEmotion() const { return mEmotion; }
+        bool isGM() const
+        { return mIsGM; }
 
         /**
-         * Sets the being's stun mode.  If zero, the being is `normal',
-         * otherwise it is `stunned' in some fashion.
+         * Triggers whether or not to show the name as a GM name.
          */
-        void setStunMode(int stunMode)
-        {
-            if (mStunMode != stunMode)
-                updateStunMode(mStunMode, stunMode);
-            mStunMode = stunMode;
-        };
-
-        void setStatusEffect(int index, bool active);
+        void setGM(bool gm);
 
         /**
-         * A status effect block is a 16 bit mask of status effects.
-         * We assign each such flag a block ID of offset + bitnr.
-         *
-         * These are NOT the same as the status effect indices.
+         * Sets the IP or an IP hash.
+         * The TMW-Athena server sends this information only to GMs.
          */
-        void setStatusEffectBlock(int offset, Uint16 flags);
+        void setIp(int ip) { mIp = ip; }
 
         /**
-         * Triggers a visual effect, such as `level up'
-         *
-         * Only draws the visual effect, does not play sound effects
-         *
-         * \param effectId ID of the effect to trigger
+         * Returns the player's IP or an IP hash.
+         * Value is 0 if not set by the server.
          */
-        virtual void triggerEffect(int effectId)
-        {
-            internalTriggerEffect(effectId, false, true);
-        }
-
-        virtual AnimatedSprite *getSprite(int index) const
-        { return mSprites[index]; }
+        int getIp() const { return mIp; }
 
-        static void load();
-
-        virtual void optionChanged(const std::string &value) {}
+        bool canTalk();
 
-        void flashName(int time);
-
-        int getDamageTaken() const
-        { return mDamageTaken; }
+        void talkTo();
 
-        void updateName();
+        void event(Channels channel, const Mana::Event &event);
 
     protected:
         /**
@@ -563,69 +492,29 @@ class Being : public Sprite, public ConfigListener
         /**
          * Updates name's location.
          */
-        virtual void updateCoords();
+        void updateCoords();
 
-        /**
-         * Gets the way the object blocks pathfinding for other objects
-         */
-        virtual Map::BlockType getBlockType() const
-        { return Map::BLOCKTYPE_NONE; }
+        void showName();
 
-        /**
-         * Trigger visual effect, with components
-         *
-         * \param effectId ID of the effect to trigger
-         * \param sfx Whether to trigger sound effects
-         * \param gfx Whether to trigger graphical effects
-         */
-        void internalTriggerEffect(int effectId, bool sfx, bool gfx);
-
-        /**
-         * Notify self that the stun mode has been updated. Invoked by
-         * setStunMode if something changed.
-         */
-        virtual void updateStunMode(int oldMode, int newMode);
+        void updateColors();
 
-        /**
-         * Notify self that a status effect has flipped.
-         * The new flag is passed.
-         */
-        virtual void updateStatusEffect(int index, bool newStatus);
+        BeingInfo *mInfo;
 
-        /**
-         * Handle an update to a status or stun effect
-         *
-         * \param The StatusEffect to effect
-         * \param effectId -1 for stun, otherwise the effect index
-         */
-        virtual void handleStatusEffect(StatusEffect *effect, int effectId);
+        int mActionTime;      /**< Time spent in current action */
 
-        virtual void showName();
-
-        /** The current sprite Frame number to be displayed */
-        int mFrame;
-
-        /** Used to trigger the nextStep (walking on next Tile)
-         * TODO: Used by eAthena only?
-         */
-        int mWalkTime;
-
-        int mEmotion;         /**< Currently showing emotion */
-        int mEmotionTime;     /**< Time until emotion disappears */
         /** Time until the last speech sentence disappears */
         int mSpeechTime;
 
+        int mAttackType;
         int mAttackSpeed;     /**< Attack speed */
+
         Action mAction;       /**< Action the being is performing */
         Uint16 mSubType;      /**< Subtype (graphical view, basically) */
 
-        int mId;                        /**< Unique sprite id */
         Uint8 mDirection;               /**< Facing direction */
         Uint8 mSpriteDirection;         /**< Facing direction */
-        Map *mMap;                      /**< Map on which this being resides */
         std::string mName;              /**< Name of character */
         std::string mPartyName;
-        MapSprite mMapSprite;
 
         /**
          * Holds a text object when the being displays it's name, 0 otherwise
@@ -643,20 +532,18 @@ class Being : public Sprite, public ConfigListener
         std::string mSpeech;
         Text *mText;
         const gcn::Color *mTextColor;
-        Uint16 mStunMode;               /**< Stun mode; zero if not stunned */
-        std::set<int> mStatusEffects;   /**< set of active status effects */
 
-        typedef std::vector<AnimatedSprite*> Sprites;
-        typedef Sprites::iterator SpriteIterator;
-        typedef Sprites::const_iterator SpriteConstIterator;
-        Sprites mSprites;
-        float mAlpha;                   /**< Alpha opacity to draw the sprite */
+        Vector mDest;  /**< destination coordinates. */
+
+        std::vector<int> mSpriteIDs;
+        std::vector<std::string> mSpriteColors;
+        Gender mGender;
 
-        ParticleList mStunParticleEffects;
-        ParticleVector mStatusParticleEffects;
-        ParticleList mChildParticleEffects;
+        // Character guild information
+        std::map<int, Guild*> mGuilds;
+        Party *mParty;
 
-        Vector mDest;  /**< destination coordinates. */
+        bool mIsGM;
 
     private:
 
@@ -667,8 +554,7 @@ class Being : public Sprite, public ConfigListener
          */
         int getOffset(char pos, char neg) const;
 
-        /** Reset particle status effects on next redraw? */
-        bool mMustResetParticles;
+        const Type mType;
 
         /** Speech Bubble components */
         SpeechBubble *mSpeechBubble;
@@ -681,13 +567,11 @@ class Being : public Sprite, public ConfigListener
          */
         Vector mWalkSpeed;
 
-        Vector mPos;  /**< Position coordinates. */
         int mX, mY;   /**< Position in tile */
 
         int mDamageTaken;
 
-        /** Target cursor being used */
-        SimpleAnimation *mUsedTargetCursor;
+        int mIp;
 };
 
 #endif
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
deleted file mode 100644
index d7045684..00000000
--- a/src/beingmanager.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "beingmanager.h"
-
-#include "localplayer.h"
-#include "monster.h"
-#include "npc.h"
-#include "player.h"
-
-#include "gui/viewport.h"
-
-#include "net/gamehandler.h"
-#include "net/net.h"
-
-#include "utils/stringutils.h"
-#include "utils/dtor.h"
-
-#include <cassert>
-
-class FindBeingFunctor
-{
-    public:
-        bool operator() (Being *being)
-        {
-            Uint16 other_y = y + ((being->getType() == Being::NPC) ? 1 : 0);
-            const Vector &pos = being->getPosition();
-            return ((int) pos.x / 32 == x &&
-                    ((int) pos.y / 32 == y || (int) pos.y / 32 == other_y) &&
-                    being->isAlive() &&
-                    (type == Being::UNKNOWN || being->getType() == type));
-        }
-
-        Uint16 x, y;
-        Being::Type type;
-} beingFinder;
-
-class PlayerNamesLister : public AutoCompleteLister
-{
-    void getAutoCompleteList(std::vector<std::string>& names) const
-    {
-        Beings::iterator i = beingManager->mBeings.begin();
-        names.clear();
-
-        while (i != beingManager->mBeings.end())
-        {
-            Being *being = (*i);
-            if (being->getType() == Being::PLAYER && being->getName() != "")
-                names.push_back(being->getName());
-
-            ++i;
-        }
-    }
-};
-
-class PlayerNPCNamesLister : public AutoCompleteLister
-{
-    void getAutoCompleteList(std::vector<std::string>& names) const
-    {
-        Beings::iterator i = beingManager->mBeings.begin();
-        names.clear();
-
-        while (i != beingManager->mBeings.end())
-        {
-            Being *being = (*i);
-            if ((being->getType() == Being::PLAYER
-                 || being->getType() == Being::NPC)
-                && being->getName() != "")
-                names.push_back(being->getName());
-
-            ++i;
-        }
-    }
-};
-
-BeingManager::BeingManager()
-{
-    mPlayerNames = new PlayerNamesLister;
-    mPlayerNPCNames = new PlayerNPCNamesLister;
-}
-
-BeingManager::~BeingManager()
-{
-    clear();
-}
-
-void BeingManager::setMap(Map *map)
-{
-    mMap = map;
-    if (player_node)
-        player_node->setMap(map);
-}
-
-void BeingManager::setPlayer(LocalPlayer *player)
-{
-    player_node = player;
-    mBeings.push_back(player);
-}
-
-Being *BeingManager::createBeing(int id, Being::Type type, int subtype)
-{
-    Being *being;
-
-    switch (type)
-    {
-        case Being::PLAYER:
-            being = new Player(id, subtype, mMap);
-            break;
-        case Being::NPC:
-            being = new NPC(id, subtype, mMap);
-            break;
-        case Being::MONSTER:
-            being = new Monster(id, subtype, mMap);
-            break;
-        case Being::UNKNOWN:
-            being = new Being(id, subtype, mMap);
-            break;
-        default:
-            assert(false);
-    }
-
-    mBeings.push_back(being);
-    return being;
-}
-
-void BeingManager::destroyBeing(Being *being)
-{
-    mBeings.remove(being);
-    viewport->clearHoverBeing(being);
-    delete being;
-}
-
-Being *BeingManager::findBeing(int id) const
-{
-    for (Beings::const_iterator i = mBeings.begin(), i_end = mBeings.end();
-         i != i_end; ++i)
-    {
-        Being *being = (*i);
-        if (being->getId() == id)
-            return being;
-    }
-    return NULL;
-}
-
-Being *BeingManager::findBeing(int x, int y, Being::Type type) const
-{
-    beingFinder.x = x;
-    beingFinder.y = y;
-    beingFinder.type = type;
-
-    Beings::const_iterator i = find_if(mBeings.begin(), mBeings.end(),
-                                       beingFinder);
-
-    return (i == mBeings.end()) ? NULL : *i;
-}
-
-Being *BeingManager::findBeingByPixel(int x, int y) const
-{
-    Beings::const_iterator itr = mBeings.begin();
-    Beings::const_iterator itr_end = mBeings.end();
-
-    for (; itr != itr_end; ++itr)
-    {
-        Being *being = (*itr);
-
-        int xtol = being->getWidth() / 2;
-        int uptol = being->getHeight();
-
-        if ((being->isAlive()) &&
-            (being != player_node) &&
-            (being->getPixelX() - xtol <= x) &&
-            (being->getPixelX() + xtol >= x) &&
-            (being->getPixelY() - uptol <= y) &&
-            (being->getPixelY() >= y))
-        {
-            return being;
-        }
-    }
-
-    return NULL;
-}
-
-Being *BeingManager::findBeingByName(const std::string &name,
-                                     Being::Type type) const
-{
-    for (Beings::const_iterator i = mBeings.begin(), i_end = mBeings.end();
-         i != i_end; ++i)
-    {
-        Being *being = (*i);
-        if (!compareStrI(being->getName(),name) &&
-           (type == Being::UNKNOWN || type == being->getType()))
-            return being;
-    }
-    return NULL;
-}
-
-const Beings &BeingManager::getAll() const
-{
-    return mBeings;
-}
-
-void BeingManager::logic()
-{
-    Beings::iterator i = mBeings.begin();
-    while (i != mBeings.end())
-    {
-        Being *being = (*i);
-
-        being->logic();
-
-        if (!being->isAlive() &&
-            Net::getGameHandler()->removeDeadBeings() &&
-            being->getCurrentFrame() >= 20)
-        {
-            delete being;
-            i = mBeings.erase(i);
-        }
-        else
-        {
-            ++i;
-        }
-    }
-}
-
-void BeingManager::clear()
-{
-    if (player_node)
-        mBeings.remove(player_node);
-
-    delete_all(mBeings);
-    mBeings.clear();
-
-    if (player_node)
-        mBeings.push_back(player_node);
-}
-
-Being *BeingManager::findNearestLivingBeing(int x, int y,
-                                            int maxTileDist, Being::Type type,
-                                            Being *excluded) const
-{
-    Being *closestBeing = 0;
-    int dist = 0;
-
-    const int maxDist = maxTileDist * 32;
-
-    Beings::const_iterator itr = mBeings.begin();
-    Beings::const_iterator itr_end = mBeings.end();
-
-    for (; itr != itr_end; ++itr)
-    {
-        Being *being = (*itr);
-        const Vector &pos = being->getPosition();
-        int d = abs(((int) pos.x) - x) + abs(((int) pos.y) - y);
-
-        if ((being->getType() == type || type == Being::UNKNOWN)
-                && (d < dist || !closestBeing)  // it is closer
-                && being->isAlive()             // no dead beings
-                && being != excluded)
-        {
-            dist = d;
-            closestBeing = being;
-        }
-    }
-
-    return (maxDist >= dist) ? closestBeing : 0;
-}
-
-Being *BeingManager::findNearestLivingBeing(Being *aroundBeing, int maxDist,
-                                            Being::Type type) const
-{
-    const Vector &pos = aroundBeing->getPosition();
-    return findNearestLivingBeing((int)pos.x, (int)pos.y, maxDist, type,
-                                  aroundBeing);
-}
-
-bool BeingManager::hasBeing(Being *being) const
-{
-    for (Beings::const_iterator i = mBeings.begin(), i_end = mBeings.end();
-         i != i_end; ++i)
-    {
-        if (being == *i)
-            return true;
-    }
-
-    return false;
-}
-
-AutoCompleteLister *BeingManager::getPlayerNameLister()
-{
-    return mPlayerNames;
-}
-
-AutoCompleteLister *BeingManager::getPlayerNPCNameLister()
-{
-    return mPlayerNPCNames;
-}
-
-void BeingManager::updatePlayerNames()
-{
-    Beings::iterator i = mBeings.begin();
-
-    while (i != mBeings.end())
-    {
-        Being *being = (*i);
-        if (being->getType() == Being::PLAYER && being->getName() != "")
-            being->updateName();
-        ++i;
-    }
-}
diff --git a/src/chatlog.cpp b/src/chatlog.cpp
new file mode 100644
index 00000000..f33b1aff
--- /dev/null
+++ b/src/chatlog.cpp
@@ -0,0 +1,175 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *
+ *  This file is part of The Mana World.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "chatlog.h"
+
+#include <iostream>
+#include <sstream>
+#include <dirent.h>
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/time.h>
+
+#ifdef WIN32
+#include <windows.h>
+#elif defined __APPLE__
+#include <Carbon/Carbon.h>
+#endif
+
+#include "configuration.h"
+
+#include "utils/stringutils.h"
+
+ChatLogger::ChatLogger()
+{
+}
+
+ChatLogger::~ChatLogger()
+{
+    if (mLogFile.is_open())
+        mLogFile.close();
+}
+
+void ChatLogger::setLogFile(const std::string &logFilename)
+{
+    if (mLogFile.is_open())
+        mLogFile.close();
+
+    mLogFile.open(logFilename.c_str(), std::ios_base::app);
+
+    if (!mLogFile.is_open())
+    {
+        std::cout << "Warning: error while opening " << logFilename <<
+            " for writing.\n";
+    }
+}
+
+void ChatLogger::setLogDir(const std::string &logDir)
+{
+    mLogDir = logDir;
+
+    if (mLogFile.is_open())
+        mLogFile.close();
+
+    DIR *dir = opendir(mLogDir.c_str());
+    if (!dir)
+        makeDir(mLogDir);
+    else
+        closedir(dir);
+}
+
+void ChatLogger::log(std::string str)
+{
+    std::string dateStr = getDateString();
+    if (!mLogFile.is_open() || dateStr != mLogDate)
+    {
+        mLogDate = dateStr;
+        setLogFile(strprintf("%s/%s/#General_%s.log", mLogDir.c_str(),
+                             mServerName.c_str(), dateStr.c_str()));
+    }
+
+    str = removeColors(str);
+    writeTo(mLogFile, str);
+}
+
+void ChatLogger::log(std::string name, std::string str)
+{
+    std::ofstream logFile;
+    logFile.open(strprintf("%s/%s/%s_%s.log", mLogDir.c_str(), mServerName.c_str(),
+                          secureName(name).c_str(), getDateString().c_str()).c_str(),
+                 std::ios_base::app);
+
+    if (!logFile.is_open())
+        return;
+
+    str = removeColors(str);
+    writeTo(logFile, str);
+
+    if (logFile.is_open())
+        logFile.close();
+}
+
+std::string ChatLogger::getDateString() const
+{
+    std::string date;
+
+    time_t rawtime;
+    struct tm *timeinfo;
+    char buffer [80];
+
+    time (&rawtime);
+    timeinfo = localtime(&rawtime);
+
+    strftime(buffer, 79, "%y-%m-%d", timeinfo);
+    date = buffer;
+    return date;
+}
+
+std::string ChatLogger::secureName(std::string &name) const
+{
+    for (unsigned int f = 0; f < name.length(); f ++)
+    {
+        if (name[f] < '0' && name[f] > '9' && name[f] < 'a' && name[f] > 'z'
+            && name[f] < 'A' && name[f] > 'Z'
+            && name[f] != '-' && name[f] != '+' && name[f] != '='
+            && name[f] != '.' && name[f] != ','&& name[f] != ')'
+            && name[f] != '(' && name[f] != '[' && name[f] != ')')
+        {
+            name[f] = '_';
+        }
+    }
+    return name;
+}
+
+void ChatLogger::writeTo(std::ofstream &file, const std::string &str) const
+{
+    file << str << std::endl;
+}
+
+void ChatLogger::setServerName(const std::string &serverName)
+{
+    mServerName = serverName;
+    if (mServerName == "")
+        mServerName = config.getStringValue("MostUsedServerName0");
+
+    if (mLogFile.is_open())
+        mLogFile.close();
+
+    secureName(mServerName);
+    if (mLogDir != "")
+    {
+        DIR *dir = opendir((mLogDir + "/" + mServerName).c_str());
+        if (!dir)
+            makeDir(mLogDir + "/" + mServerName);
+        else
+            closedir(dir);
+    }
+}
+
+void ChatLogger::makeDir(const std::string &dir)
+{
+#ifdef WIN32
+    mkdir(dir.c_str());
+#else
+    mkdir(dir.c_str(), 0750);
+#endif
+}
diff --git a/src/chatlog.h b/src/chatlog.h
new file mode 100644
index 00000000..c359e953
--- /dev/null
+++ b/src/chatlog.h
@@ -0,0 +1,73 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *
+ *  This file is part of The Mana World.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _CHATLOG_H
+#define _CHATLOG_H
+
+#include <fstream>
+
+class ChatLogger
+{
+    public:
+        /**
+         * Constructor.
+         */
+        ChatLogger();
+
+        /**
+         * Destructor, closes log file.
+         */
+        ~ChatLogger();
+
+        void setLogDir(const std::string &logDir);
+
+        /**
+         * Enters a message in the log. The message will be timestamped.
+         */
+        void log(std::string str);
+
+        void log(std::string name, std::string str);
+
+        std::string getDateString() const;
+
+        std::string secureName(std::string &str) const;
+
+        void setServerName(const std::string &serverName);
+
+    private:
+        /**
+         * Sets the file to log to and opens it
+         */
+        void setLogFile(const std::string &logFilename);
+
+        void writeTo(std::ofstream &file, const std::string &str) const;
+
+        void makeDir(const std::string &dir);
+
+        std::ofstream mLogFile;
+        std::string mLogDir;
+        std::string mServerName;
+        std::string mLogDate;
+};
+
+extern ChatLogger *chatLogger;
+
+#endif
diff --git a/src/client.cpp b/src/client.cpp
index abe3500c..7dbbdc88 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -22,8 +22,10 @@
 #include "client.h"
 #include "main.h"
 
+#include "chatlog.h"
 #include "configuration.h"
 #include "emoteshortcut.h"
+#include "event.h"
 #include "game.h"
 #include "itemshortcut.h"
 #include "keyboardconfig.h"
@@ -47,10 +49,8 @@
 #include "gui/sdlinput.h"
 #include "gui/serverdialog.h"
 #include "gui/setup.h"
-#include "gui/theme.h"
 #include "gui/unregisterdialog.h"
 #include "gui/updatewindow.h"
-#include "gui/userpalette.h"
 #include "gui/worldselectdialog.h"
 
 #include "gui/widgets/button.h"
@@ -69,8 +69,11 @@
 #include "resources/image.h"
 #include "resources/itemdb.h"
 #include "resources/monsterdb.h"
+#include "resources/specialdb.h"
 #include "resources/npcdb.h"
 #include "resources/resourcemanager.h"
+#include "resources/theme.h"
+#include "resources/userpalette.h"
 
 #include "utils/gettext.h"
 #include "utils/mkdir.h"
@@ -111,11 +114,14 @@ Configuration config;         /**< XML file configuration reader */
 Configuration branding;       /**< XML branding information reader */
 Configuration paths;          /**< XML default paths information reader */
 Logger *logger;               /**< Log object */
+ChatLogger *chatLogger;       /**< Chat log object */
 KeyboardConfig keyboard;
 
 UserPalette *userPalette;
 Graphics *graphics;
 
+ItemDB *itemDb;
+
 Sound sound;
 
 void ErrorListener::action(const gcn::ActionEvent &)
@@ -166,6 +172,22 @@ int get_elapsed_time(int start_time)
                 * MILLISECONDS_IN_A_TICK;
 }
 
+bool isDoubleClick(int selected)
+{
+    const Uint32 maximumDelay = 500;
+    static Uint32 lastTime = 0;
+    static int lastSelected = -1;
+
+    if (selected == lastSelected && lastTime + maximumDelay >= SDL_GetTicks())
+    {
+        lastTime = 0;
+        return true;
+    }
+
+    lastTime = SDL_GetTicks();
+    lastSelected = selected;
+    return false;
+}
 
 // This anonymous namespace hides whatever is inside from other modules.
 namespace {
@@ -188,8 +210,16 @@ public:
     }
 } loginListener;
 
-} // anonymous namespace
+class ServerChoiceListener : public gcn::ActionListener
+{
+public:
+    void action(const gcn::ActionEvent &)
+    {
+        Client::setState(STATE_CHOOSE_SERVER);
+    }
+} serverChoiceListener;
 
+} // anonymous namespace
 
 Client *Client::mInstance = 0;
 
@@ -216,15 +246,22 @@ Client::Client(const Options &options):
     if (!options.brandingPath.empty())
     {
         branding.init(options.brandingPath);
+        branding.setDefaultValues(getBrandingDefaults());
     }
 
     initRootDir();
     initHomeDir();
     initConfiguration();
 
+    chatLogger = new ChatLogger;
+    if (options.chatLogDir == "")
+        chatLogger->setLogDir(mLocalDataDir + std::string("/logs/"));
+    else
+        chatLogger->setLogDir(options.chatLogDir);
+
     // Configure logger
     logger->setLogFile(mLocalDataDir + std::string("/mana.log"));
-    logger->setLogToStandardOut(config.getValue("logToStandardOut", 0));
+    logger->setLogToStandardOut(config.getBoolValue("logToStandardOut"));
 
     // Log the mana version
     logger->log("Mana %s", FULL_VERSION);
@@ -347,11 +384,11 @@ Client::Client(const Options &options):
     graphics = new Graphics;
 #endif
 
-    const int width = (int) config.getValue("screenwidth", defaultScreenWidth);
-    const int height = (int) config.getValue("screenheight", defaultScreenHeight);
+    const int width = config.getIntValue("screenwidth");
+    const int height = config.getIntValue("screenheight");
     const int bpp = 0;
-    const bool fullscreen = ((int) config.getValue("screen", 0) == 1);
-    const bool hwaccel = ((int) config.getValue("hwaccel", 0) == 1);
+    const bool fullscreen = config.getBoolValue("screen");
+    const bool hwaccel = config.getBoolValue("hwaccel");
 
     // Try to set the desired video mode
     if (!graphics->setVideoMode(width, height, bpp, fullscreen, hwaccel))
@@ -374,13 +411,11 @@ Client::Client(const Options &options):
     // Initialize sound engine
     try
     {
-        if (config.getValue("sound", 0) == 1)
+        if (config.getBoolValue("sound"))
             sound.init();
 
-        sound.setSfxVolume((int) config.getValue("sfxVolume",
-                    defaultSfxVolume));
-        sound.setMusicVolume((int) config.getValue("musicVolume",
-                    defaultMusicVolume));
+        sound.setSfxVolume(config.getIntValue("sfxVolume"));
+        sound.setMusicVolume(config.getIntValue("musicVolume"));
     }
     catch (const char *err)
     {
@@ -405,25 +440,25 @@ Client::Client(const Options &options):
     mCurrentServer.port = options.serverPort;
     loginData.username = options.username;
     loginData.password = options.password;
-    loginData.remember = config.getValue("remember", 0);
+    loginData.remember = config.getBoolValue("remember");
     loginData.registerLogin = false;
 
     if (mCurrentServer.hostname.empty())
-    {
-        mCurrentServer.hostname = branding.getValue("defaultServer",
-                                                    "").c_str();
-    }
+        mCurrentServer.hostname = branding.getValue("defaultServer","").c_str();
 
     if (mCurrentServer.port == 0)
     {
         mCurrentServer.port = (short) branding.getValue("defaultPort",
-                                                       DEFAULT_PORT);
+                                                                  DEFAULT_PORT);
         mCurrentServer.type = ServerInfo::parseType(
-                branding.getValue("defaultServerType", "tmwathena"));
+                           branding.getValue("defaultServerType", "tmwathena"));
     }
 
+    if (chatLogger)
+        chatLogger->setServerName(mCurrentServer.hostname);
+
     if (loginData.username.empty() && loginData.remember)
-        loginData.username = config.getValue("username", "");
+        loginData.username = config.getStringValue("username");
 
     if (mState != STATE_ERROR)
         mState = STATE_CHOOSE_SERVER;
@@ -435,8 +470,16 @@ Client::Client(const Options &options):
 
     // Initialize frame limiting
     SDL_initFramerate(&mFpsManager);
-    config.addListener("fpslimit", this);
-    optionChanged("fpslimit");
+
+    listen(CHANNEL_CONFIG);
+
+    //TODO: fix having to fake a option changed event
+    Mana::Event fakeevent(EVENT_CONFIGOPTIONCHANGED);
+    fakeevent.setString("option", "fpslimit");
+    event(CHANNEL_CONFIG, fakeevent);
+
+    // Initialize PlayerInfo
+    PlayerInfo::init();
 }
 
 Client::~Client()
@@ -447,7 +490,7 @@ Client::~Client()
     // Unload XML databases
     ColorDB::unload();
     EmoteDB::unload();
-    ItemDB::unload();
+    delete itemDb;
     MonsterDB::unload();
     NPCDB::unload();
     StatusEffect::unload();
@@ -577,10 +620,8 @@ int Client::exec()
                                      - 3, 3);
             top->add(mSetupButton);
 
-            int screenWidth = (int) config.getValue("screenwidth",
-                                                    defaultScreenWidth);
-            int screenHeight = (int) config.getValue("screenheight",
-                                                     defaultScreenHeight);
+            int screenWidth = config.getIntValue("screenwidth");
+            int screenHeight = config.getIntValue("screenheight");
 
             mDesktop->setSize(screenWidth, screenHeight);
         }
@@ -592,9 +633,12 @@ int Client::exec()
 
         if (mState != mOldState)
         {
-            Net::GeneralHandler *generalHandler = Net::getGeneralHandler();
-            if (generalHandler)
-                generalHandler->stateChanged(mOldState, mState);
+            {
+                Mana::Event event(EVENT_STATECHANGE);
+                event.setInt("oldState", mOldState);
+                event.setInt("newState", mState);
+                event.trigger(CHANNEL_CLIENT);
+            }
 
             if (mOldState == STATE_GAME)
             {
@@ -751,17 +795,48 @@ int Client::exec()
 
                     // Read default paths file 'data/paths.xml'
                     paths.init("paths.xml", true);
+                    paths.setDefaultValues(getPathsDefaults());
+
+                    Mana::Event::trigger(CHANNEL_CLIENT, EVENT_DBSLOADING);
 
                     // Load XML databases
                     ColorDB::load();
-                    ItemDB::load();
+                    switch (Net::getNetworkType())
+                    {
+                      case ServerInfo::TMWATHENA:
+                        itemDb = new TmwAthena::TaItemDB;
+                      break;
+                      case ServerInfo::MANASERV:
+                        itemDb = new ManaServ::ManaServItemDB;
+                      break;
+                      default:
+                        // Nothing
+                        itemDb = 0;
+                      break;
+                    }
+                    if (!itemDb || !itemDb->isLoaded())
+                    {
+                        // Warn and return to login screen
+                        errorMessage =
+                            _("This server is missing needed world data. "
+                              "Please contact the administrator(s).");
+                        mCurrentDialog = new OkDialog(
+                            _("ItemDB: Error while loading " ITEMS_DB_FILE "!"),
+                            errorMessage);
+                        mCurrentDialog->addActionListener(&serverChoiceListener);
+                        mCurrentDialog = NULL; // OkDialog deletes itself
+                        break;
+                    }
                     Being::load(); // Hairstyles
                     MonsterDB::load();
+                    SpecialDB::load();
                     NPCDB::load();
                     EmoteDB::load();
                     StatusEffect::load();
                     Units::loadUnits();
 
+                    ActorSprite::load();
+
                     mDesktop->reloadWallpaper();
 
                     mState = STATE_GET_CHARACTERS;
@@ -787,7 +862,7 @@ int Client::exec()
                             mOptions.character, CharSelectDialog::Choose))
                     {
                         ((CharSelectDialog*) mCurrentDialog)->selectByName(
-                                config.getValue("lastCharacter", ""),
+                                config.getStringValue("lastCharacter"),
                                 mOptions.chooseDefault ?
                                     CharSelectDialog::Choose :
                                     CharSelectDialog::Focus);
@@ -997,12 +1072,18 @@ int Client::exec()
     return 0;
 }
 
-void Client::optionChanged(const std::string &name)
+void Client::event(Channels channel, const Mana::Event &event)
 {
-    const int fpsLimit = (int) config.getValue("fpslimit", 60);
-    mLimitFps = fpsLimit > 0;
-    if (mLimitFps)
-        SDL_setFramerate(&mFpsManager, fpsLimit);
+    if (channel == CHANNEL_CONFIG &&
+        event.getName() == EVENT_CONFIGOPTIONCHANGED &&
+        event.getString("option") == "fpslimit")
+    {
+        const int fpsLimit = config.getIntValue("fpslimit");
+        mLimitFps = fpsLimit > 0;
+        if (mLimitFps)
+            SDL_setFramerate(&mFpsManager, fpsLimit);
+    }
+
 }
 
 void Client::action(const gcn::ActionEvent &event)
@@ -1086,6 +1167,9 @@ void Client::initHomeDir()
         mLocalDataDir = std::string(PHYSFS_getUserDir()) +
             "/Library/Application Support/" +
             branding.getValue("appName", "Mana");
+#elif defined __HAIKU__
+        mLocalDataDir = std::string(PHYSFS_getUserDir()) +
+           "/config/data/Mana";
 #elif defined WIN32
         mLocalDataDir = getSpecialFolderLocation(CSIDL_LOCAL_APPDATA);
         if (mLocalDataDir.empty())
@@ -1110,6 +1194,10 @@ void Client::initHomeDir()
         const std::string app = branding.getValue("appShort", "manasource");
 #ifdef __APPLE__
         mConfigDir = mLocalDataDir + "/" + app;
+#elif defined __HAIKU__
+        mConfigDir = std::string(PHYSFS_getUserDir()) +
+           "/config/settings/Mana" +
+           branding.getValue("appName", "manasource");
 #elif defined WIN32
         mConfigDir = getSpecialFolderLocation(CSIDL_APPDATA);
         if (mConfigDir.empty())
@@ -1204,6 +1292,7 @@ void Client::initConfiguration()
     {
         fclose(configFile);
         config.init(configPath);
+        config.setDefaultValues(getConfigDefaults());
     }
 }
 
@@ -1218,7 +1307,7 @@ void Client::initUpdatesDir()
     // If updatesHost is currently empty, fill it from config file
     if (mUpdateHost.empty())
     {
-        mUpdateHost = config.getValue("updatehost", "");
+        mUpdateHost = config.getStringValue("updatehost");
     }
 
     // Don't go out of range int he next check
@@ -1226,7 +1315,7 @@ void Client::initUpdatesDir()
         return;
 
     // Remove any trailing slash at the end of the update host
-    if (mUpdateHost.at(mUpdateHost.size() - 1) == '/')
+    if (!mUpdateHost.empty() && mUpdateHost.at(mUpdateHost.size() - 1) == '/')
         mUpdateHost.resize(mUpdateHost.size() - 1);
 
     // Parse out any "http://" or "ftp://", and set the updates directory
@@ -1234,7 +1323,7 @@ void Client::initUpdatesDir()
     pos = mUpdateHost.find("://");
     if (pos != mUpdateHost.npos)
     {
-        if (pos + 3 < mUpdateHost.length())
+        if (pos + 3 < mUpdateHost.length() && !mUpdateHost.empty())
         {
             updates << "updates/" << mUpdateHost.substr(pos + 3);
             mUpdatesDir = updates.str();
@@ -1305,7 +1394,7 @@ void Client::initScreenshotDir()
         mScreenshotDir = std::string(PHYSFS_getUserDir()) + "Desktop";
 #endif
 
-        if (config.getValue("useScreenshotDirectorySuffix", true))
+        if (config.getBoolValue("useScreenshotDirectorySuffix"))
         {
             std::string configScreenshotSuffix =
                 config.getValue("screenshotDirectorySuffix",
diff --git a/src/client.h b/src/client.h
index f44d8bf2..8d2c23d5 100644
--- a/src/client.h
+++ b/src/client.h
@@ -22,7 +22,7 @@
 #ifndef CLIENT_H
 #define CLIENT_H
 
-#include "configlistener.h"
+#include "listener.h"
 
 #include "net/serverinfo.h"
 
@@ -68,6 +68,12 @@ extern LoginData loginData;
 int get_elapsed_time(int start_time);
 
 /**
+ * Returns if this call and the last call were done for the same
+ * selected index and within a short time.
+ */
+bool isDoubleClick(int selected);
+
+/**
  * All client states.
  */
 enum State {
@@ -113,7 +119,7 @@ enum State {
  * The core part of the client. This class initializes all subsystems, runs
  * the event loop, and shuts everything down again.
  */
-class Client : public ConfigListener, public gcn::ActionListener
+class Client : public Mana::Listener, public gcn::ActionListener
 {
 public:
     /**
@@ -142,6 +148,7 @@ public:
         std::string brandingPath;
         std::string updateHost;
         std::string dataPath;
+        std::string chatLogDir;
         std::string configDir;
         std::string localDataDir;
         std::string screenshotDir;
@@ -178,7 +185,7 @@ public:
     static const std::string &getScreenshotDirectory()
     { return instance()->mScreenshotDir; }
 
-    void optionChanged(const std::string &name);
+    void event(Channels channel, const Mana::Event &event);
     void action(const gcn::ActionEvent &event);
 
 private:
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index f8ef116c..f5864a24 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -21,15 +21,13 @@
 
 #include "commandhandler.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
 #include "channelmanager.h"
 #include "channel.h"
 #include "game.h"
 #include "localplayer.h"
 #include "playerrelations.h"
 
-#include "gui/chat.h"
-
 #include "gui/widgets/channeltab.h"
 #include "gui/widgets/chattab.h"
 
@@ -49,7 +47,8 @@ void CommandHandler::handleCommand(const std::string &command, ChatTab *tab)
 {
     std::string::size_type pos = command.find(' ');
     std::string type(command, 0, pos);
-    std::string args(command, pos == std::string::npos ? command.size() : pos + 1);
+    std::string args(command, pos == std::string::npos ?
+                                     command.size() : pos + 1);
     trim(args);
 
     if (type == "help") // Do help before tabs so they can't override it
@@ -124,14 +123,14 @@ void CommandHandler::handleCommand(const std::string &command, ChatTab *tab)
     {
         handlePresent(args, tab);
     }
-    else if (type == "away")
-    {
-        handleAway(args, tab);
-    }
     else if (type == "showip" && Net::getNetworkType() == ServerInfo::TMWATHENA)
     {
         handleShowIp(args, tab);
     }
+    else if (type == "away")
+    {
+        handleAway(args, tab);
+    }
     else
     {
         tab->chatLog(_("Unknown command."));
@@ -395,7 +394,7 @@ void CommandHandler::handleMsg(const std::string &args, ChatTab *tab)
         if (tempNick.compare(playerName) == 0 || args.empty())
             return;
 
-        chatWindow->whisper(recvnick, msg, true);
+        chatWindow->whisper(recvnick, msg, BY_PLAYER);
     }
     else
         tab->chatLog(_("Cannot send empty whispers!"), BY_SERVER);
@@ -524,7 +523,7 @@ void CommandHandler::handleShowIp(const std::string &args, ChatTab *tab)
             return;
     }
 
-    beingManager->updatePlayerNames();
+    actorSpriteManager->updatePlayerNames();
 }
 
 void CommandHandler::handlePresent(const std::string &args, ChatTab *tab)
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
new file mode 100644
index 00000000..ec45825f
--- /dev/null
+++ b/src/compoundsprite.cpp
@@ -0,0 +1,364 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "compoundsprite.h"
+
+#include "game.h"
+#include "graphics.h"
+#include "map.h"
+
+#include "resources/image.h"
+
+#include <SDL.h>
+
+#define BUFFER_WIDTH 100
+#define BUFFER_HEIGHT 100
+
+CompoundSprite::CompoundSprite():
+        mImage(NULL),
+        mAlphaImage(NULL),
+        mNeedsRedraw(false)
+{
+    mAlpha = 1.0f;
+}
+
+CompoundSprite::~CompoundSprite()
+{
+    SpriteIterator it, it_end;
+    for (it = begin(), it_end = end(); it != it_end; it++)
+        delete (*it);
+
+    clear();
+
+    delete mImage;
+    delete mAlphaImage;
+}
+
+bool CompoundSprite::reset()
+{
+    bool ret = false;
+
+    SpriteIterator it, it_end;
+    for (it = begin(), it_end = end(); it != it_end; it++)
+        if (*it)
+            ret |= (*it)->reset();
+
+    mNeedsRedraw |= ret;
+    return ret;
+}
+
+bool CompoundSprite::play(std::string action)
+{
+    bool ret = false;
+
+    SpriteIterator it, it_end;
+    for (it = begin(), it_end = end(); it != it_end; it++)
+        if (*it)
+            ret |= (*it)->play(action);
+
+    mNeedsRedraw |= ret;
+    return ret;
+}
+
+bool CompoundSprite::update(int time)
+{
+    bool ret = false;
+
+    SpriteIterator it, it_end;
+    for (it = begin(), it_end = end(); it != it_end; it++)
+        if (*it)
+            ret |= (*it)->update(time);
+
+    mNeedsRedraw |= ret;
+    return ret;
+}
+
+bool CompoundSprite::draw(Graphics* graphics, int posX, int posY) const
+{
+    if (mNeedsRedraw)
+        redraw();
+
+    if (mAlpha == 1.0f && mImage)
+    {
+        return graphics->drawImage(mImage, posX + mOffsetX, posY + mOffsetY);
+    }
+    else if (mAlpha && mAlphaImage)
+    {
+        if (mAlphaImage->getAlpha() != mAlpha)
+            mAlphaImage->setAlpha(mAlpha);
+
+        return graphics->drawImage(mAlphaImage,
+                                   posX + mOffsetX, posY + mOffsetY);
+    }
+    else
+    {
+        SpriteConstIterator it, it_end;
+        for (it = begin(), it_end = end(); it != it_end; it++)
+        {
+            if (*it)
+            {
+                if ((*it)->getAlpha() != mAlpha)
+                    (*it)->setAlpha(mAlpha);
+                (*it)->draw(graphics, posX, posY);
+            }
+        }
+    }
+
+    return false;
+}
+
+int CompoundSprite::getWidth() const
+{
+    Sprite *base = NULL;
+
+    SpriteConstIterator it, it_end;
+    for (it = begin(), it_end = end(); it != it_end; it++)
+        if ((base = (*it)))
+            break;
+
+    if (base)
+        return base->getWidth();
+
+    return 0;
+}
+
+int CompoundSprite::getHeight() const
+{
+    Sprite *base = NULL;
+
+    SpriteConstIterator it, it_end;
+    for (it = begin(), it_end = end(); it != it_end; it++)
+        if ((base = (*it)))
+            break;
+
+    if (base)
+        return base->getHeight();
+
+    return 0;
+}
+
+const Image* CompoundSprite::getImage() const
+{
+    return mImage;
+}
+
+bool CompoundSprite::setDirection(SpriteDirection direction)
+{
+    bool ret = false;
+
+    SpriteIterator it, it_end;
+    for (it = begin(), it_end = end(); it != it_end; it++)
+        if (*it)
+            ret |= (*it)->setDirection(direction);
+
+    mNeedsRedraw |= ret;
+    return ret;
+}
+
+int CompoundSprite::getNumberOfLayers() const
+{
+    if (mImage || mAlphaImage)
+    {
+        return 1;
+    }
+    else
+    {
+        return size();
+    }
+}
+
+size_t CompoundSprite::getCurrentFrame() const
+{
+    SpriteConstIterator it, it_end;
+    for (it = begin(), it_end = end(); it != it_end; it++)
+        if (*it)
+            return (*it)->getCurrentFrame();
+
+    return 0;
+}
+
+size_t CompoundSprite::getFrameCount() const
+{
+    SpriteConstIterator it, it_end;
+    for (it = begin(), it_end = end(); it != it_end; it++)
+        if (*it)
+            return (*it)->getFrameCount();
+
+    return 0;
+}
+
+void CompoundSprite::addSprite(Sprite* sprite)
+{
+    push_back(sprite);
+    mNeedsRedraw = true;
+}
+
+void CompoundSprite::setSprite(int layer, Sprite* sprite)
+{
+    // Skip if it won't change anything
+    if (at(layer) == sprite)
+        return;
+
+    if (at(layer))
+        delete at(layer);
+    at(layer) = sprite;
+    mNeedsRedraw = true;
+}
+
+void CompoundSprite::removeSprite(int layer)
+{
+    // Skip if it won't change anything
+    if (at(layer) == NULL)
+        return;
+
+    delete at(layer);
+    at(layer) = NULL;
+    mNeedsRedraw = true;
+}
+
+void CompoundSprite::clear()
+{
+    // Skip if it won't change anything
+    if (empty())
+        return;
+
+    std::vector<Sprite*>::clear();
+    mNeedsRedraw = true;
+}
+
+void CompoundSprite::ensureSize(size_t layerCount)
+{
+    // Skip if it won't change anything
+    if (size() >= layerCount)
+        return;
+
+    resize(layerCount, NULL);
+    mNeedsRedraw = true;
+}
+
+/**
+ * Returns the curent frame in the current animation of the given layer.
+ */
+size_t CompoundSprite::getCurrentFrame(size_t layer)
+{
+    if (layer >= size())
+        return 0;
+
+    Sprite *s = getSprite(layer);
+    if (s)
+        return s->getCurrentFrame();
+
+    return 0;
+}
+
+/**
+ * Returns the frame count in the current animation of the given layer.
+ */
+size_t CompoundSprite::getFrameCount(size_t layer)
+{
+    if (layer >= size())
+        return 0;
+
+    Sprite *s = getSprite(layer);
+    if (s)
+        return s->getFrameCount();
+
+    return 0;
+}
+
+void CompoundSprite::redraw() const
+{
+    // TODO OpenGL support
+    if (Image::getLoadAsOpenGL())
+    {
+        mNeedsRedraw = false;
+        return;
+    }
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+    int rmask = 0xff000000;
+    int gmask = 0x00ff0000;
+    int bmask = 0x0000ff00;
+    int amask = 0x000000ff;
+#else
+    int rmask = 0x000000ff;
+    int gmask = 0x0000ff00;
+    int bmask = 0x00ff0000;
+    int amask = 0xff000000;
+#endif
+
+    SDL_Surface *surface = SDL_CreateRGBSurface(SDL_HWSURFACE,
+                                            BUFFER_WIDTH, BUFFER_HEIGHT,
+                                            32, rmask, gmask, bmask, amask);
+
+    if (!surface)
+        return;
+
+    Graphics *graphics = new Graphics();
+    graphics->setBlitMode(Graphics::BLIT_GFX);
+    graphics->setTarget(surface);
+    graphics->_beginDraw();
+
+    int tileX = 32 / 2;
+    int tileY = 32;
+
+    Game *game = Game::instance();
+    if (game)
+    {
+        Map *map = game->getCurrentMap();
+        tileX = map->getTileWidth() / 2;
+        tileY = map->getTileWidth();
+    }
+
+    int posX = BUFFER_WIDTH / 2 - tileX;
+    int posY = BUFFER_HEIGHT - tileY;
+
+    mOffsetX = tileX - BUFFER_WIDTH / 2;
+    mOffsetY = tileY - BUFFER_HEIGHT;
+
+    SpriteConstIterator it, it_end;
+    for (it = begin(), it_end = end(); it != it_end; it++)
+    {
+        if (*it)
+        {
+            (*it)->draw(graphics, posX, posY);
+        }
+    }
+
+    delete graphics;
+
+    SDL_Surface *surfaceA = SDL_CreateRGBSurface(SDL_HWSURFACE,
+                                            BUFFER_WIDTH, BUFFER_HEIGHT,
+                                            32, rmask, gmask, bmask, amask);
+
+    SDL_SetAlpha(surface, 0, SDL_ALPHA_OPAQUE);
+    SDL_BlitSurface(surface, NULL, surfaceA, NULL);
+
+    delete mImage;
+    delete mAlphaImage;
+
+    mImage = Image::load(surface);
+    SDL_FreeSurface(surface);
+
+    mAlphaImage = Image::load(surfaceA);
+    SDL_FreeSurface(surfaceA);
+
+    mNeedsRedraw = false;
+}
diff --git a/src/compoundsprite.h b/src/compoundsprite.h
new file mode 100644
index 00000000..3b443219
--- /dev/null
+++ b/src/compoundsprite.h
@@ -0,0 +1,105 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef COMPOUNDSPRITE_H
+#define COMPOUNDSPRITE_H
+
+#include "sprite.h"
+
+#include <vector>
+
+class Image;
+
+class CompoundSprite : public Sprite, private std::vector<Sprite*>
+{
+public:
+    CompoundSprite();
+
+    ~CompoundSprite();
+
+    virtual bool reset();
+
+    virtual bool play(std::string action);
+
+    virtual bool update(int time);
+
+    virtual bool draw(Graphics* graphics, int posX, int posY) const;
+
+    /**
+     * Gets the width in pixels of the first sprite in the list.
+     */
+    virtual int getWidth() const;
+
+    /**
+     * Gets the height in pixels of the first sprite in the list.
+     */
+    virtual int getHeight() const;
+
+    virtual const Image* getImage() const;
+
+    virtual bool setDirection(SpriteDirection direction);
+
+    int getNumberOfLayers() const;
+
+    size_t getCurrentFrame() const;
+
+    size_t getFrameCount() const;
+
+    size_t size() const
+    { return std::vector<Sprite*>::size(); }
+
+    void addSprite(Sprite* sprite);
+
+    void setSprite(int layer, Sprite* sprite);
+
+    Sprite *getSprite(int layer) const
+    { return at(layer); }
+
+    void removeSprite(int layer);
+
+    void clear();
+
+    void ensureSize(size_t layerCount);
+
+    /**
+     * Returns the curent frame in the current animation of the given layer.
+     */
+    virtual size_t getCurrentFrame(size_t layer);
+
+    /**
+     * Returns the frame count in the current animation of the given layer.
+     */
+    virtual size_t getFrameCount(size_t layer);
+
+private:
+    typedef CompoundSprite::iterator SpriteIterator;
+    typedef CompoundSprite::const_iterator SpriteConstIterator;
+
+    void redraw() const;
+
+    mutable Image *mImage;
+    mutable Image *mAlphaImage;
+
+    mutable int mOffsetX, mOffsetY;
+
+    mutable bool mNeedsRedraw;
+};
+
+#endif // COMPOUNDSPRITE_H
diff --git a/src/configuration.cpp b/src/configuration.cpp
index d8b11034..44fb6e2e 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -21,7 +21,7 @@
 
 #include "configuration.h"
 
-#include "configlistener.h"
+#include "event.h"
 #include "log.h"
 
 #include "utils/stringutils.h"
@@ -38,15 +38,9 @@ void Configuration::setValue(const std::string &key, const std::string &value)
     ConfigurationObject::setValue(key, value);
 
     // Notify listeners
-    ListenerMapIterator list = mListenerMap.find(key);
-    if (list != mListenerMap.end())
-    {
-        Listeners listeners = list->second;
-        for (ListenerIterator i = listeners.begin(); i != listeners.end(); i++)
-        {
-            (*i)->optionChanged(key);
-        }
-    }
+    Mana::Event event(EVENT_CONFIGOPTIONCHANGED);
+    event.setString("option", key);
+    event.trigger(CHANNEL_CONFIG);
 }
 
 std::string ConfigurationObject::getValue(const std::string &key,
@@ -79,8 +73,11 @@ double ConfigurationObject::getValue(const std::string &key,
 void ConfigurationObject::deleteList(const std::string &name)
 {
     for (ConfigurationList::const_iterator
-             it = mContainerOptions[name].begin(); it != mContainerOptions[name].end(); it++)
+         it = mContainerOptions[name].begin();
+         it != mContainerOptions[name].end(); it++)
+    {
         delete *it;
+    }
 
     mContainerOptions[name].clear();
 }
@@ -88,8 +85,11 @@ void ConfigurationObject::deleteList(const std::string &name)
 void ConfigurationObject::clear()
 {
     for (std::map<std::string, ConfigurationList>::const_iterator
-             it = mContainerOptions.begin(); it != mContainerOptions.end(); it++)
+         it = mContainerOptions.begin(); it != mContainerOptions.end(); it++)
+    {
         deleteList(it->first);
+    }
+
     mOptions.clear();
 }
 
@@ -98,6 +98,131 @@ ConfigurationObject::~ConfigurationObject()
     clear();
 }
 
+void Configuration::cleanDefaults()
+{
+    if (mDefaultsData)
+    {
+        for (DefaultsData::const_iterator iter = mDefaultsData->begin();
+             iter != mDefaultsData->end(); iter++)
+        {
+            if (iter->second)
+                delete(iter->second);
+        }
+        mDefaultsData->clear();
+        delete mDefaultsData;
+        mDefaultsData = 0;
+    }
+}
+
+Configuration::~Configuration()
+{
+    cleanDefaults();
+}
+
+void Configuration::setDefaultValues(DefaultsData *defaultsData)
+{
+    cleanDefaults();
+    mDefaultsData = defaultsData;
+}
+
+Mana::VariableData* Configuration::getDefault(const std::string &key,
+                                              Mana::VariableData::DataType type
+                                             ) const
+{
+    if (mDefaultsData)
+    {
+        DefaultsData::const_iterator itdef = mDefaultsData->find(key);
+
+        if (itdef != mDefaultsData->end() && itdef->second
+            && itdef->second->getType() == type)
+        {
+            return itdef->second;
+        }
+        else
+        {
+            logger->log("%s: No value in registry for key %s",
+                        mConfigPath.c_str(), key.c_str());
+        }
+    }
+    return NULL;
+}
+
+int Configuration::getIntValue(const std::string &key) const
+{
+    int defaultValue = 0;
+    Options::const_iterator iter = mOptions.find(key);
+    if (iter == mOptions.end())
+    {
+        Mana::VariableData* vd = getDefault(key, Mana::VariableData::DATA_INT);
+        if (vd)
+            defaultValue = ((Mana::IntData*)vd)->getData();
+    }
+    else
+    {
+        defaultValue = atoi(iter->second.c_str());
+    }
+    return defaultValue;
+}
+
+std::string Configuration::getStringValue(const std::string &key) const
+{
+    std::string defaultValue = "";
+    Options::const_iterator iter = mOptions.find(key);
+    if (iter == mOptions.end())
+    {
+        Mana::VariableData* vd = getDefault(key,
+                                            Mana::VariableData::DATA_STRING);
+
+        if (vd)
+            defaultValue = ((Mana::StringData*)vd)->getData();
+    }
+    else
+    {
+        defaultValue = iter->second;
+    }
+    return defaultValue;
+}
+
+
+float Configuration::getFloatValue(const std::string &key) const
+{
+    float defaultValue = 0.0f;
+    Options::const_iterator iter = mOptions.find(key);
+    if (iter == mOptions.end())
+    {
+        Mana::VariableData* vd = getDefault(key,
+            Mana::VariableData::DATA_FLOAT);
+
+        if (vd)
+            defaultValue = ((Mana::FloatData*)vd)->getData();
+    }
+    else
+    {
+        defaultValue = atof(iter->second.c_str());
+    }
+    return defaultValue;
+}
+
+bool Configuration::getBoolValue(const std::string &key) const
+{
+    bool defaultValue = false;
+    Options::const_iterator iter = mOptions.find(key);
+    if (iter == mOptions.end())
+    {
+        Mana::VariableData* vd = getDefault(key,
+            Mana::VariableData::DATA_BOOL);
+
+        if (vd)
+            defaultValue = ((Mana::BoolData*)vd)->getData();
+    }
+    else
+    {
+        return getBoolFromString(iter->second, defaultValue);
+    }
+
+    return defaultValue;
+}
+
 void ConfigurationObject::initFromXML(xmlNodePtr parent_node)
 {
     clear();
@@ -106,8 +231,7 @@ void ConfigurationObject::initFromXML(xmlNodePtr parent_node)
     {
         if (xmlStrEqual(node->name, BAD_CAST "list"))
         {
-            // list option handling
-
+            // List option handling.
             std::string name = XML::getProperty(node, "name", std::string());
 
             for_each_xml_child_node(subnode, node)
@@ -117,7 +241,7 @@ void ConfigurationObject::initFromXML(xmlNodePtr parent_node)
                 {
                     ConfigurationObject *cobj = new ConfigurationObject;
 
-                    cobj->initFromXML(subnode); // recurse
+                    cobj->initFromXML(subnode); // Recurse
 
                     mContainerOptions[name].push_back(cobj);
                 }
@@ -126,14 +250,13 @@ void ConfigurationObject::initFromXML(xmlNodePtr parent_node)
         }
         else if (xmlStrEqual(node->name, BAD_CAST "option"))
         {
-            // single option handling
-
+            // Single option handling.
             std::string name = XML::getProperty(node, "name", std::string());
             std::string value = XML::getProperty(node, "value", std::string());
 
             if (!name.empty())
                 mOptions[name] = value;
-        } // otherwise ignore
+        } // Otherwise ignore
     }
 }
 
@@ -177,16 +300,16 @@ void ConfigurationObject::writeToXML(xmlTextWriterPtr writer)
     }
 
     for (std::map<std::string, ConfigurationList>::const_iterator
-             it = mContainerOptions.begin(); it != mContainerOptions.end(); it++)
+        it = mContainerOptions.begin(); it != mContainerOptions.end(); it++)
     {
         const char *name = it->first.c_str();
 
         xmlTextWriterStartElement(writer, BAD_CAST "list");
         xmlTextWriterWriteAttribute(writer, BAD_CAST "name", BAD_CAST name);
 
-        // recurse on all elements
+        // Recurse on all elements
         for (ConfigurationList::const_iterator
-                 elt_it = it->second.begin(); elt_it != it->second.end(); elt_it++)
+             elt_it = it->second.begin(); elt_it != it->second.end(); elt_it++)
         {
             xmlTextWriterStartElement(writer, BAD_CAST name);
             (*elt_it)->writeToXML(writer);
@@ -231,15 +354,3 @@ void Configuration::write()
     xmlTextWriterEndDocument(writer);
     xmlFreeTextWriter(writer);
 }
-
-void Configuration::addListener(
-        const std::string &key, ConfigListener *listener)
-{
-    mListenerMap[key].push_front(listener);
-}
-
-void Configuration::removeListener(
-        const std::string &key, ConfigListener *listener)
-{
-    mListenerMap[key].remove(listener);
-}
diff --git a/src/configuration.h b/src/configuration.h
index 908d13a4..a46b0718 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -23,6 +23,7 @@
 #define CONFIGURATION_H
 
 #include "utils/stringutils.h"
+#include "defaults.h"
 
 #include <libxml/xmlwriter.h>
 
@@ -31,7 +32,6 @@
 #include <map>
 #include <string>
 
-class ConfigListener;
 class ConfigurationObject;
 
 /**
@@ -192,7 +192,7 @@ class ConfigurationObject
 class Configuration : public ConfigurationObject
 {
     public:
-        virtual ~Configuration() {}
+        ~Configuration();
 
         /**
          * Reads config file and parse all options into memory.
@@ -203,20 +203,16 @@ class Configuration : public ConfigurationObject
         void init(const std::string &filename, bool useResManager = false);
 
         /**
-         * Writes the current settings back to the config file.
-         */
-        void write();
-
-        /**
-         * Adds a listener to the listen list of the specified config option.
+         * Set the default values for each keys.
+         *
+         * @param defaultsData data used as defaults.
          */
-        void addListener(const std::string &key, ConfigListener *listener);
+        void setDefaultValues(DefaultsData *defaultsData);
 
         /**
-         * Removes a listener from the listen list of the specified config
-         * option.
+         * Writes the current settings back to the config file.
          */
-        void removeListener(const std::string &key, ConfigListener *listener);
+        void write();
 
         void setValue(const std::string &key, const std::string &value);
 
@@ -238,14 +234,29 @@ class Configuration : public ConfigurationObject
         inline void setValue(const std::string &key, bool value)
         { setValue(key, value ? "1" : "0"); }
 
+        /**
+         * returns a value corresponding to the given key.
+         * The default value returned in based on fallbacks registry.
+         * @see defaults.h
+         */
+        int getIntValue(const std::string &key) const;
+
+        float getFloatValue(const std::string &key) const;
+
+        std::string getStringValue(const std::string &key) const;
+
+        bool getBoolValue(const std::string &key) const;
+
+        Mana::VariableData* getDefault(const std::string &key,
+                                       Mana::VariableData::DataType type) const;
     private:
-        typedef std::list<ConfigListener*> Listeners;
-        typedef Listeners::iterator ListenerIterator;
-        typedef std::map<std::string, Listeners> ListenerMap;
-        typedef ListenerMap::iterator ListenerMapIterator;
-        ListenerMap mListenerMap;
+        /**
+         * Clean up the default values member.
+         */
+        void cleanDefaults();
 
-        std::string mConfigPath;            /**< Location of config file */
+        std::string mConfigPath;       /**< Location of config file */
+        DefaultsData *mDefaultsData;   /**< Defaults of value for a given key */
 };
 
 extern Configuration branding;
diff --git a/src/defaults.cpp b/src/defaults.cpp
new file mode 100644
index 00000000..e0e48d60
--- /dev/null
+++ b/src/defaults.cpp
@@ -0,0 +1,181 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "defaults.h"
+
+#include "being.h"
+#include "graphics.h"
+#include "client.h"
+
+#include <stdlib.h>
+
+using namespace Mana;
+
+VariableData* createData(int defData)
+{
+    return new IntData(defData);
+}
+
+VariableData* createData(double defData)
+{
+    return new FloatData(defData);
+}
+
+VariableData* createData(float defData)
+{
+    return new FloatData(defData);
+}
+
+VariableData* createData(const std::string &defData)
+{
+    return new StringData(defData);
+}
+
+VariableData* createData(const char* defData)
+{
+    return new StringData(defData);
+}
+
+VariableData* createData(bool defData)
+{
+    return new BoolData(defData);
+}
+
+#define AddDEF(defaultsData, key, value)  \
+ defaultsData->insert(std::pair<std::string, VariableData*> \
+                     (key, createData(value)));
+
+
+DefaultsData* getConfigDefaults()
+{
+    DefaultsData* configData = new DefaultsData;
+    // Init main config defaults
+    AddDEF(configData, "OverlayDetail", 2);
+    AddDEF(configData, "speechBubblecolor", "000000");
+    AddDEF(configData, "speechBubbleAlpha", 1.0f);
+    AddDEF(configData, "MostUsedServerName0", "server.themanaworld.org");
+    AddDEF(configData, "visiblenames", true);
+    AddDEF(configData, "speech", Being::TEXT_OVERHEAD);
+    AddDEF(configData, "showgender", false);
+    AddDEF(configData, "showMonstersTakedDamage", false);
+    AddDEF(configData, "particleMaxCount", 3000);
+    AddDEF(configData, "particleFastPhysics", 0);
+    AddDEF(configData, "particleEmitterSkip", 1);
+    AddDEF(configData, "particleeffects", true);
+    AddDEF(configData, "logToStandardOut", false);
+    AddDEF(configData, "opengl", false);
+    AddDEF(configData, "screenwidth", defaultScreenWidth);
+    AddDEF(configData, "screenheight", defaultScreenHeight);
+    AddDEF(configData, "screen", false);
+    AddDEF(configData, "hwaccel", false);
+    AddDEF(configData, "sound", false);
+    AddDEF(configData, "sfxVolume", 100);
+    AddDEF(configData, "musicVolume", 60);
+    AddDEF(configData, "remember", false);
+    AddDEF(configData, "username", "");
+    AddDEF(configData, "lastCharacter", "");
+    AddDEF(configData, "fpslimit", 60);
+    AddDEF(configData, "updatehost", "");
+    AddDEF(configData, "screenshotDirectory", "");
+    AddDEF(configData, "useScreenshotDirectorySuffix", true);
+    AddDEF(configData, "screenshotDirectorySuffix", "");
+    AddDEF(configData, "EnableSync", false);
+    AddDEF(configData, "joystickEnabled", false);
+    AddDEF(configData, "upTolerance", 100);
+    AddDEF(configData, "downTolerance", 100);
+    AddDEF(configData, "leftTolerance", 100);
+    AddDEF(configData, "rightTolerance", 100);
+    AddDEF(configData, "logNpcInGui", true);
+    AddDEF(configData, "download-music", false);
+    AddDEF(configData, "guialpha", 0.8f);
+    AddDEF(configData, "ChatLogLength", 0);
+    AddDEF(configData, "enableChatLog", false);
+    AddDEF(configData, "whispertab", false);
+    AddDEF(configData, "customcursor", true);
+    AddDEF(configData, "showownname", false);
+    AddDEF(configData, "showpickupparticle", false);
+    AddDEF(configData, "showpickupchat", true);
+    AddDEF(configData, "fontSize", 11);
+    AddDEF(configData, "ReturnToggles", false);
+    AddDEF(configData, "ScrollLaziness", 16);
+    AddDEF(configData, "ScrollRadius", 0);
+    AddDEF(configData, "ScrollCenterOffsetX", 0);
+    AddDEF(configData, "ScrollCenterOffsetY", 0);
+    AddDEF(configData, "onlineServerList", "");
+    AddDEF(configData, "theme", "");
+    AddDEF(configData, "disableTransparency", false);
+
+    return configData;
+}
+
+DefaultsData* getBrandingDefaults()
+{
+    DefaultsData* brandingData = new DefaultsData;
+    // Init config defaults
+    AddDEF(brandingData, "wallpapersPath", "");
+    AddDEF(brandingData, "wallpapersFile", "");
+    AddDEF(brandingData, "appName", "Mana");
+    AddDEF(brandingData, "appIcon", "icons/mana");
+    AddDEF(brandingData, "loginMusic", "Magick - Real.ogg");
+    AddDEF(brandingData, "defaultServer", "");
+    AddDEF(brandingData, "defaultPort", DEFAULT_PORT);
+    AddDEF(brandingData, "defaultServerType", "tmwathena");
+    AddDEF(brandingData, "onlineServerList", "a");
+    AddDEF(brandingData, "appShort", "mana");
+    AddDEF(brandingData, "defaultUpdateHost", "");
+    AddDEF(brandingData, "helpPath", "");
+    AddDEF(brandingData, "onlineServerList", "");
+    AddDEF(brandingData, "guiThemePath", "");
+    AddDEF(brandingData, "theme", "");
+    AddDEF(brandingData, "font", "fonts/dejavusans.ttf");
+    AddDEF(brandingData, "boldFont", "fonts/dejavusans-bold.ttf");
+
+    return brandingData;
+}
+
+DefaultsData* getPathsDefaults()
+{
+    DefaultsData *pathsData = new DefaultsData;
+    // Init paths.xml defaults
+    AddDEF(pathsData, "itemIcons", "graphics/items/");
+    AddDEF(pathsData, "unknownItemFile", "unknown-item.png");
+    AddDEF(pathsData, "sprites", "graphics/sprites/");
+    AddDEF(pathsData, "spriteErrorFile", "error.xml");
+
+    AddDEF(pathsData, "particles", "graphics/particles/");
+    AddDEF(pathsData, "levelUpEffectFile", "levelup.particle.xml");
+    AddDEF(pathsData, "portalEffectFile", "warparea.particle.xml");
+
+    AddDEF(pathsData, "minimaps", "graphics/minimaps/");
+    AddDEF(pathsData, "maps", "maps/");
+
+    AddDEF(pathsData, "sfx", "sfx/");
+    AddDEF(pathsData, "attackSfxFile", "fist-swish.ogg");
+    AddDEF(pathsData, "music", "music/");
+
+    AddDEF(pathsData, "wallpapers", "graphics/images/");
+    AddDEF(pathsData, "wallpaperFile", "login_wallpaper.png");
+
+    AddDEF(pathsData, "help", "help/");
+
+    return pathsData;
+}
+
+#undef AddDEF
diff --git a/src/configlistener.h b/src/defaults.h
index 923b3115..b9dfa511 100644
--- a/src/configlistener.h
+++ b/src/defaults.h
@@ -1,7 +1,6 @@
 /*
  *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2010  The Mana Developers
  *
  *  This file is part of The Mana Client.
  *
@@ -19,30 +18,17 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CONFIGLISTENER_H
-#define CONFIGLISTENER_H
+#ifndef DEFAULTS_H
+#define DEFAULTS_H
 
+#include <map>
 #include <string>
+#include "variabledata.h"
 
-/**
- * The listener interface for receiving notifications about changes to
- * configuration options.
- *
- * \ingroup CORE
- */
-class ConfigListener
-{
-    public:
-        /**
-         * Destructor.
-         */
-        virtual ~ConfigListener() {}
+typedef std::map<std::string, Mana::VariableData*> DefaultsData;
 
-        /**
-         * Called when an option changed. The config listener will have to be
-         * registered to the option name first.
-         */
-        virtual void optionChanged(const std::string &name) = 0;
-};
+DefaultsData* getConfigDefaults();
+DefaultsData* getBrandingDefaults();
+DefaultsData* getPathsDefaults();
 
 #endif
diff --git a/src/equipment.h b/src/equipment.h
index 6c099324..0aa10fb0 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -39,22 +39,6 @@ class Equipment
          */
         ~Equipment() { mBackend = 0; }
 
-        enum Slot
-        {
-            EQUIP_TORSO_SLOT = 0,
-            EQUIP_GLOVES_SLOT = 1,
-            EQUIP_HEAD_SLOT = 2,
-            EQUIP_LEGS_SLOT = 3,
-            EQUIP_FEET_SLOT = 4,
-            EQUIP_RING1_SLOT = 5,
-            EQUIP_RING2_SLOT = 6,
-            EQUIP_NECK_SLOT = 7,
-            EQUIP_FIGHT1_SLOT = 8,
-            EQUIP_FIGHT2_SLOT = 9,
-            EQUIP_PROJECTILE_SLOT = 10,
-            EQUIP_VECTOREND
-        };
-
         class Backend {
             public:
                 virtual Item *getEquipment(int index) const = 0;
diff --git a/src/event.cpp b/src/event.cpp
new file mode 100644
index 00000000..c8de2ffd
--- /dev/null
+++ b/src/event.cpp
@@ -0,0 +1,255 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "event.h"
+
+#include "listener.h"
+#include "variabledata.h"
+
+namespace Mana
+{
+
+ListenMap Event::mBindings;
+
+Event::~Event()
+{
+    VariableMap::iterator it = mData.begin();
+    while (it != mData.end())
+    {
+        delete it->second;
+        it++;
+    }
+}
+
+// Integers
+
+void Event::setInt(const std::string &key, int value) throw (BadEvent)
+{
+    if (mData.find(key) != mData.end())
+        throw KEY_ALREADY_EXISTS;
+
+    mData[key] = new IntData(value);
+}
+
+int Event::getInt(const std::string &key) const throw (BadEvent)
+{
+    VariableMap::const_iterator it = mData.find(key);
+    if (it == mData.end())
+        throw BAD_KEY;
+
+    if (it->second->getType() != VariableData::DATA_INT)
+        throw BAD_VALUE;
+
+    return static_cast<IntData *>(it->second)->getData();
+}
+
+bool Event::hasInt(const std::string &key) const
+{
+    VariableMap::const_iterator it = mData.find(key);
+    return !(it == mData.end()
+             || it->second->getType() != VariableData::DATA_INT);
+}
+
+// Strings
+
+void Event::setString(const std::string &key, const std::string &value) throw (BadEvent)
+{
+    if (mData.find(key) != mData.end())
+        throw KEY_ALREADY_EXISTS;
+
+    mData[key] = new StringData(value);
+}
+
+const std::string &Event::getString(const std::string &key) const throw (BadEvent)
+{
+    VariableMap::const_iterator it = mData.find(key);
+    if (it == mData.end())
+        throw BAD_KEY;
+
+    if (it->second->getType() != VariableData::DATA_STRING)
+        throw BAD_VALUE;
+
+    return static_cast<StringData *>(it->second)->getData();
+}
+
+
+bool Event::hasString(const std::string &key) const
+{
+    VariableMap::const_iterator it = mData.find(key);
+    return !(it == mData.end()
+             || it->second->getType() != VariableData::DATA_STRING);
+}
+
+// Floats
+
+void Event::setFloat(const std::string &key, double value) throw (BadEvent)
+{
+    if (mData.find(key) != mData.end())
+        throw KEY_ALREADY_EXISTS;
+
+    mData[key] = new FloatData(value);
+}
+
+double Event::getFloat(const std::string &key) const throw (BadEvent)
+{
+    VariableMap::const_iterator it = mData.find(key);
+    if (it == mData.end())
+        throw BAD_KEY;
+
+    if (it->second->getType() != VariableData::DATA_FLOAT)
+        throw BAD_VALUE;
+
+    return static_cast<FloatData *>(it->second)->getData();
+}
+
+bool Event::hasFloat(const std::string &key) const
+{
+    VariableMap::const_iterator it = mData.find(key);
+    return !(it == mData.end()
+             || it->second->getType() != VariableData::DATA_FLOAT);
+}
+
+// Booleans
+
+void Event::setBool(const std::string &key, bool value) throw (BadEvent)
+{
+    if (mData.find(key) != mData.end())
+        throw KEY_ALREADY_EXISTS;
+
+    mData[key] = new BoolData(value);
+}
+
+bool Event::getBool(const std::string &key) const throw (BadEvent)
+{
+    VariableMap::const_iterator it = mData.find(key);
+    if (it == mData.end())
+        throw BAD_KEY;
+
+    if (it->second->getType() != VariableData::DATA_BOOL)
+        throw BAD_VALUE;
+
+    return static_cast<BoolData *>(it->second)->getData();
+}
+
+bool Event::hasBool(const std::string &key) const
+{
+    VariableMap::const_iterator it = mData.find(key);
+    return !(it == mData.end()
+             || it->second->getType() != VariableData::DATA_BOOL);
+}
+
+// Items
+
+void Event::setItem(const std::string &key, Item *value) throw (BadEvent)
+{
+    if (mData.find(key) != mData.end())
+        throw KEY_ALREADY_EXISTS;
+
+    mData[key] = new ItemData(value);
+}
+
+Item *Event::getItem(const std::string &key) const throw (BadEvent)
+{
+    VariableMap::const_iterator it = mData.find(key);
+    if (it == mData.end())
+        throw BAD_KEY;
+
+    if (it->second->getType() != VariableData::DATA_ITEM)
+        throw BAD_VALUE;
+
+    return static_cast<ItemData *>(it->second)->getData();
+}
+
+bool Event::hasItem(const std::string &key) const
+{
+    VariableMap::const_iterator it = mData.find(key);
+    return !(it == mData.end()
+             || it->second->getType() != VariableData::DATA_ITEM);
+}
+
+// Actors
+
+void Event::setActor(const std::string &key, ActorSprite *value) throw (BadEvent)
+{
+    if (mData.find(key) != mData.end())
+        throw KEY_ALREADY_EXISTS;
+
+    mData[key] = new ActorData(value);
+}
+
+ActorSprite *Event::getActor(const std::string &key) const throw (BadEvent)
+{
+    VariableMap::const_iterator it = mData.find(key);
+    if (it == mData.end())
+        throw BAD_KEY;
+
+    if (it->second->getType() != VariableData::DATA_ACTOR)
+        throw BAD_VALUE;
+
+    return static_cast<ActorData *>(it->second)->getData();
+}
+
+bool Event::hasActor(const std::string &key) const
+{
+    VariableMap::const_iterator it = mData.find(key);
+    return !(it == mData.end()
+             || it->second->getType() != VariableData::DATA_ACTOR);
+}
+
+// Triggers
+
+void Event::trigger(Channels channel, const Event &event)
+{
+    ListenMap::iterator it = mBindings.find(channel);
+
+    // Make sure something is listening
+    if (it == mBindings.end())
+        return;
+
+    // Loop though all listeners
+    ListenerSet::iterator lit = it->second.begin();
+    while (lit != it->second.end())
+    {
+        (*lit)->event(channel, event);
+        lit++;
+    }
+}
+
+void Event::bind(Listener *listener, Channels channel)
+{
+    mBindings[channel].insert(listener);
+}
+
+void Event::unbind(Listener *listener, Channels channel)
+{
+    mBindings[channel].erase(listener);
+}
+
+void Event::remove(Listener *listener)
+{
+    ListenMap::iterator it = mBindings.begin();
+    while (it != mBindings.end())
+    {
+        it->second.erase(listener);
+        it++;
+    }
+}
+
+} // namespace Mana
diff --git a/src/event.h b/src/event.h
new file mode 100644
index 00000000..758d6b34
--- /dev/null
+++ b/src/event.h
@@ -0,0 +1,339 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EVENT_H
+#define EVENT_H
+
+#include <map>
+#include <set>
+#include <string>
+
+class ActorSprite;
+class Item;
+
+enum Channels
+{
+    CHANNEL_ACTORSPRITE,
+    CHANNEL_ATTRIBUTES,
+    CHANNEL_BUYSELL,
+    CHANNEL_CHAT,
+    CHANNEL_CLIENT,
+    CHANNEL_CONFIG,
+    CHANNEL_GAME,
+    CHANNEL_ITEM,
+    CHANNEL_NOTICES,
+    CHANNEL_NPC,
+    CHANNEL_STATUS,
+    CHANNEL_STORAGE
+};
+
+enum Events
+{
+    EVENT_ANNOUNCEMENT,
+    EVENT_BEING,
+    EVENT_CLOSE,
+    EVENT_CLOSEALL,
+    EVENT_CLOSESENT,
+    EVENT_CONFIGOPTIONCHANGED,
+    EVENT_CONSTRUCTED,
+    EVENT_DBSLOADING,
+    EVENT_DESTROYED,
+    EVENT_DESTRUCTED,
+    EVENT_DESTRUCTING,
+    EVENT_DOCLOSEINVENTORY,
+    EVENT_DODROP,
+    EVENT_DOEQUIP,
+    EVENT_DOMOVE,
+    EVENT_DOSPLIT,
+    EVENT_DOUNEQUIP,
+    EVENT_DOUSE,
+    EVENT_END,
+    EVENT_ENGINESINITALIZED,
+    EVENT_ENGINESINITALIZING,
+    EVENT_GUIWINDOWSLOADED,
+    EVENT_GUIWINDOWSLOADING,
+    EVENT_GUIWINDOWSUNLOADED,
+    EVENT_GUIWINDOWSUNLOADING,
+    EVENT_INTEGERINPUT,
+    EVENT_INTEGERINPUTSENT,
+    EVENT_MAPLOADED,
+    EVENT_MENU,
+    EVENT_MENUSENT,
+    EVENT_MESSAGE,
+    EVENT_NEXT,
+    EVENT_NEXTSENT,
+    EVENT_NPCCOUNT,
+    EVENT_PLAYER,
+    EVENT_POST,
+    EVENT_POSTCOUNT,
+    EVENT_SENDLETTERSENT,
+    EVENT_SERVERNOTICE,
+    EVENT_STATECHANGE,
+    EVENT_STORAGECOUNT,
+    EVENT_STRINGINPUT,
+    EVENT_STRINGINPUTSENT,
+    EVENT_STUN,
+    EVENT_TALKSENT,
+    EVENT_TRADING,
+    EVENT_UPDATEATTRIBUTE,
+    EVENT_UPDATESTAT,
+    EVENT_UPDATESTATUSEFFECT,
+    EVENT_WHISPER,
+    EVENT_WHISPERERROR
+};
+
+namespace Mana
+{
+
+// Possible exception that can be thrown
+enum BadEvent {
+    BAD_KEY,
+    BAD_VALUE,
+    KEY_ALREADY_EXISTS
+};
+
+class Listener;
+
+typedef std::set<Listener *> ListenerSet;
+typedef std::map<Channels, ListenerSet > ListenMap;
+
+class VariableData;
+typedef std::map<std::string, VariableData *> VariableMap;
+
+#define SERVER_NOTICE(message) { \
+Mana::Event event(EVENT_SERVERNOTICE); \
+event.setString("message", message); \
+event.trigger(CHANNEL_NOTICES, event); }
+
+class Event
+{
+public:
+    /**
+     * Makes an event with the given name.
+     */
+    Event(Events name)
+    { mEventName = name; }
+
+    ~Event();
+
+    /**
+     * Returns the name of the event.
+     */
+    Events getName() const
+    { return mEventName; }
+
+// Integers
+
+    /**
+     * Sets the given variable to the given integer, if it isn't already set.
+     */
+    void setInt(const std::string &key, int value) throw (BadEvent);
+
+    /**
+     * Returns the given variable if it is set and an integer.
+     */
+    int getInt(const std::string &key) const throw (BadEvent);
+
+    /**
+     * Returns the given variable if it is set and an integer, returning the
+     * given default otherwise.
+     */
+    inline int getInt(const std::string &key, int defaultValue) const
+    { try { return getInt(key); } catch (BadEvent) { return defaultValue; }}
+
+    /**
+     * Returns true if the given variable exists and is an integer.
+     */
+    bool hasInt(const std::string &key) const;
+
+// Strings
+
+    /**
+     * Sets the given variable to the given string, if it isn't already set.
+     */
+    void setString(const std::string &key, const std::string &value) throw (BadEvent);
+
+    /**
+     * Returns the given variable if it is set and a string.
+     */
+    const std::string &getString(const std::string &key) const throw (BadEvent);
+
+    /**
+     * Returns the given variable if it is set and a string, returning the
+     * given default otherwise.
+     */
+    inline std::string getString(const std::string &key,
+                                 const std::string &defaultValue) const
+    { try { return getString(key); } catch (BadEvent) { return defaultValue; }}
+
+    /**
+     * Returns true if the given variable exists and is a string.
+     */
+    bool hasString(const std::string &key) const;
+
+// Floats
+
+    /**
+     * Sets the given variable to the given floating-point, if it isn't already
+     * set.
+     */
+    void setFloat(const std::string &key, double value) throw (BadEvent);
+
+    /**
+     * Returns the given variable if it is set and a floating-point.
+     */
+    double getFloat(const std::string &key) const throw (BadEvent);
+
+    /**
+     * Returns the given variable if it is set and a floating-point, returning
+     * the given default otherwise.
+     */
+    inline double getFloat(const std::string &key, float defaultValue) const
+    { try { return getFloat(key); } catch (BadEvent) { return defaultValue; }}
+
+    /**
+     * Returns true if the given variable exists and is a floating-point.
+     */
+    bool hasFloat(const std::string &key) const;
+
+// Booleans
+
+    /**
+     * Sets the given variable to the given boolean, if it isn't already set.
+     */
+    void setBool(const std::string &key, bool value) throw (BadEvent);
+
+    /**
+     * Returns the given variable if it is set and a boolean.
+     */
+    bool getBool(const std::string &key) const throw (BadEvent);
+
+    /**
+     * Returns the given variable if it is set and a boolean, returning the
+     * given default otherwise.
+     */
+    inline bool getBool(const std::string &key, bool defaultValue) const
+    { try { return getBool(key); } catch (BadEvent) { return defaultValue; }}
+
+    /**
+     * Returns true if the given variable exists and is a boolean.
+     */
+    bool hasBool(const std::string &key) const;
+
+// Items
+
+    /**
+     * Sets the given variable to the given Item, if it isn't already set.
+     */
+    void setItem(const std::string &key, Item *value) throw (BadEvent);
+
+    /**
+     * Returns the given variable if it is set and an Item.
+     */
+    Item *getItem(const std::string &key) const throw (BadEvent);
+
+    /**
+     * Returns the given variable if it is set and an Item, returning the
+     * given default otherwise.
+     */
+    inline Item *getItem(const std::string &key, Item *defaultValue) const
+    { try { return getItem(key); } catch (BadEvent) { return defaultValue; }}
+
+    /**
+     * Returns true if the given variable exists and is an Item.
+     */
+    bool hasItem(const std::string &key) const;
+
+// ActorSprites
+
+    /**
+     * Sets the given variable to the given actor, if it isn't already set.
+     */
+    void setActor(const std::string &key, ActorSprite *value) throw (BadEvent);
+
+    /**
+     * Returns the given variable if it is set and an actor.
+     */
+    ActorSprite *getActor(const std::string &key) const throw (BadEvent);
+
+    /**
+     * Returns the given variable if it is set and an actor, returning the
+     * given default otherwise.
+     */
+    inline ActorSprite *getActor(const std::string &key,
+                                 ActorSprite *defaultValue) const
+    { try { return getActor(key); } catch (BadEvent) { return defaultValue; }}
+
+    /**
+     * Returns true if the given variable exists and is an actor.
+     */
+    bool hasActor(const std::string &key) const;
+
+// Triggers
+
+    /**
+     * Sends this event to all classes listening to the given channel.
+     */
+    inline void trigger(Channels channel) const
+    { trigger(channel, *this); }
+
+    /**
+     * Sends the given event to all classes listening to the given channel.
+     */
+    static void trigger(Channels channel, const Event &event);
+
+    /**
+     * Sends an empty event with the given name to all classes listening to the
+     * given channel.
+     */
+    static inline void trigger(Channels channel, Events name)
+    { trigger(channel, Mana::Event(name)); }
+
+protected:
+    friend class Listener;
+
+    /**
+     * Binds the given listener to the given channel. The listener will receive
+     * all events triggered on the channel.
+     */
+    static void bind(Listener *listener, Channels channel);
+
+    /**
+     * Unbinds the given listener from the given channel. The listener will no
+     * longer receive any events from the channel.
+     */
+    static void unbind(Listener *listener, Channels channel);
+
+    /**
+     * Unbinds the given listener from all channels.
+     */
+    static void remove(Listener *listener);
+
+private:
+    static ListenMap mBindings;
+
+    Events mEventName;
+
+    VariableMap mData;
+};
+
+} // namespace Mana
+
+#endif
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index c3442a86..db62ce9a 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -21,59 +21,34 @@
 
 #include "flooritem.h"
 
-#include "graphics.h"
-#include "item.h"
-#include "map.h"
+#include "net/net.h"
 
-#include "resources/image.h"
+#include "resources/itemdb.h"
+#include "resources/iteminfo.h"
 
 FloorItem::FloorItem(int id,
                      int itemId,
                      int x,
                      int y,
                      Map *map):
-    mId(id),
+    ActorSprite(id),
+    mItemId(itemId),
     mX(x),
-    mY(y),
-    mMap(map),
-    mAlpha(1.0f)
+    mY(y)
 {
-    // Create a corresponding item instance
-    mItem = new Item(itemId);
+    setMap(map);
 
-    // Add ourselves to the map
-    mMapSprite = mMap->addSprite(this);
-}
-
-FloorItem::~FloorItem()
-{
-    // Remove ourselves from the map
-    mMap->removeSprite(mMapSprite);
+    // TODO: Eventually, we probably should fix all sprite offsets so that
+    //       these translations aren't necessary anymore. The sprites know
+    //       best where their base point should be.
+    mPos.x = x * map->getTileWidth() + 16;
+    mPos.y = y * map->getTileHeight() +
+             ((Net::getNetworkType() == ServerInfo::MANASERV) ? 15 : 32);
 
-    delete mItem;
-}
-
-int FloorItem::getItemId() const
-{
-    return mItem->getId();
+    setupSpriteDisplay(itemDb->get(itemId).getDisplay());
 }
 
-Item *FloorItem::getItem() const
+const ItemInfo &FloorItem::getInfo() const
 {
-    return mItem;
-}
-
-void FloorItem::draw(Graphics *graphics, int offsetX, int offsetY) const
-{
-    if (mItem)
-    {
-        Image *image = mItem->getDrawImage();
-
-        if (image)
-            if (mAlpha != image->getAlpha())
-                image->setAlpha(mAlpha);
-
-        graphics->drawImage(image, mX * mMap->getTileWidth() + offsetX,
-                            mY * mMap->getTileHeight() + offsetY);
-    }
+    return itemDb->get(mItemId);
 }
diff --git a/src/flooritem.h b/src/flooritem.h
index ec8c37cd..e599c939 100644
--- a/src/flooritem.h
+++ b/src/flooritem.h
@@ -22,19 +22,14 @@
 #ifndef FLOORITEM_H
 #define FLOORITEM_H
 
-#include "map.h"
-#include "sprite.h"
+#include "actorsprite.h"
 
-#include <list>
-
-class Graphics;
-class Image;
-class Item;
+class ItemInfo;
 
 /**
  * An item lying on the floor.
  */
-class FloorItem : public Sprite
+class FloorItem : public ActorSprite
 {
     public:
         /**
@@ -52,72 +47,29 @@ class FloorItem : public Sprite
                   int y,
                   Map *map);
 
-        ~FloorItem();
-
-        /**
-         * Returns instance ID of this item.
-         */
-        int getId() const { return mId; }
+        Type getType() const { return FLOOR_ITEM; }
 
         /**
          * Returns the item ID.
          */
-        int getItemId() const;
-
-        /**
-         * Returns the item object. Useful for adding an item link for the
-         * floor item to chat.
-         */
-        Item *getItem() const;
-
-        /**
-         * Returns the x coordinate in tiles.
-         */
-        int getX() const { return mX; }
+        int getItemId() const
+        { return mItemId; }
 
         /**
-         * Returns the y coordinate in tiles.
+         * Returns the item info for this floor item. Useful for adding an item
+         * link for the floor item to chat.
          */
-        int getY() const { return mY; }
+        const ItemInfo &getInfo() const;
 
-        /**
-         * Returns the pixel y coordinate.
-         *
-         * @see Sprite::getPixelY()
-         */
-        int getPixelY() const
-        { return mY * mMap->getTileHeight() + mMap->getTileHeight() / 2; }
-
-        /**
-         * Draws this floor item to the given graphics context.
-         *
-         * @see Sprite::draw(Graphics, int, int)
-         */
-        void draw(Graphics *graphics, int offsetX, int offsetY) const;
-
-        /**
-         * Sets the alpha value of the floor item
-         */
-        void setAlpha(float alpha)
-        { mAlpha = alpha; }
-
-        /**
-         * Returns the current alpha opacity of the floor item.
-         */
-        virtual float getAlpha() const
-        { return mAlpha; }
+        virtual int getTileX() const
+        { return mX; }
 
-        /** We consider flooritems (at least for now) to be one layer-sprites */
-        virtual int getNumberOfLayers() const
-        { return 1; }
+        virtual int getTileY() const
+        { return mY; }
 
     private:
-        int mId;
+        int mItemId;
         int mX, mY;
-        Item *mItem;
-        MapSprite mMapSprite;
-        Map *mMap;
-        float mAlpha;
 };
 
 #endif
diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp
deleted file mode 100644
index a190a168..00000000
--- a/src/flooritemmanager.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "flooritemmanager.h"
-#include "flooritem.h"
-
-#include "game.h"
-
-#include "utils/dtor.h"
-
-FloorItemManager::~FloorItemManager()
-{
-    clear();
-}
-
-FloorItem *FloorItemManager::create(int id, int itemId, int x, int y)
-{
-    Map *map = Game::instance()->getCurrentMap();
-    FloorItem *floorItem = new FloorItem(id, itemId, x, y, map);
-    mFloorItems.push_back(floorItem);
-    return floorItem;
-}
-
-void FloorItemManager::destroy(FloorItem *item)
-{
-    mFloorItems.remove(item);
-    delete item;
-}
-
-void FloorItemManager::clear()
-{
-    delete_all(mFloorItems);
-    mFloorItems.clear();
-}
-
-FloorItem *FloorItemManager::findById(int id) const
-{
-    FloorItems::const_iterator i;
-    for (i = mFloorItems.begin(); i != mFloorItems.end(); i++)
-    {
-        if ((*i)->getId() == id)
-        {
-            return *i;
-        }
-    }
-
-    return NULL;
-}
-
-FloorItem *FloorItemManager::findByCoordinates(int x, int y) const
-{
-    FloorItems::const_iterator i;
-    for (i = mFloorItems.begin(); i != mFloorItems.end(); i++)
-    {
-        if ((*i)->getX() == x && (*i)->getY() == y)
-        {
-            return *i;
-        }
-    }
-
-    return NULL;
-}
diff --git a/src/flooritemmanager.h b/src/flooritemmanager.h
deleted file mode 100644
index 62ca8dc2..00000000
--- a/src/flooritemmanager.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FLOORITEMMANAGER_H
-#define FLOORITEMMANAGER_H
-
-#include <list>
-
-class FloorItem;
-class Map;
-
-class FloorItemManager
-{
-    public:
-        ~FloorItemManager();
-
-        FloorItem *create(int id, int itemId, int x, int y);
-
-        void destroy(FloorItem *item);
-
-        void clear();
-
-        FloorItem *findById(int id) const;
-        FloorItem *findByCoordinates(int x, int y) const;
-
-    private:
-        typedef std::list<FloorItem*> FloorItems;
-        typedef FloorItems::iterator FloorItemIterator;
-        FloorItems mFloorItems;
-
-};
-
-// TODO Get rid of the global?
-extern FloorItemManager *floorItemManager;
-
-#endif
diff --git a/src/game.cpp b/src/game.cpp
index 512b8b5f..fd453434 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -21,14 +21,15 @@
 
 #include "game.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
+#include "actorsprite.h"
 #include "channelmanager.h"
 #include "client.h"
 #include "commandhandler.h"
 #include "configuration.h"
 #include "effectmanager.h"
+#include "event.h"
 #include "emoteshortcut.h"
-#include "flooritemmanager.h"
 #include "graphics.h"
 #include "itemshortcut.h"
 #include "joystick.h"
@@ -36,7 +37,6 @@
 #include "localplayer.h"
 #include "log.h"
 #include "map.h"
-#include "npc.h"
 #include "particle.h"
 #include "playerrelations.h"
 #include "sound.h"
@@ -52,7 +52,6 @@
 #include "gui/minimap.h"
 #include "gui/ministatus.h"
 #include "gui/npcdialog.h"
-#include "gui/npcpostdialog.h"
 #include "gui/okdialog.h"
 #include "gui/outfitwindow.h"
 #include "gui/quitdialog.h"
@@ -115,8 +114,7 @@ OutfitWindow *outfitWindow;
 SpecialsWindow *specialsWindow;
 SocialWindow *socialWindow;
 
-BeingManager *beingManager = NULL;
-FloorItemManager *floorItemManager = NULL;
+ActorSpriteManager *actorSpriteManager = NULL;
 ChannelManager *channelManager = NULL;
 CommandHandler *commandHandler = NULL;
 Particle *particleEngine = NULL;
@@ -130,14 +128,17 @@ ChatTab *localChatTab = NULL;
  */
 static void initEngines()
 {
-    beingManager = new BeingManager;
+    Mana::Event::trigger(CHANNEL_GAME, EVENT_ENGINESINITALIZING);
+
+    actorSpriteManager = new ActorSpriteManager;
     commandHandler = new CommandHandler;
-    floorItemManager = new FloorItemManager;
     channelManager = new ChannelManager;
     effectManager = new EffectManager;
 
     particleEngine = new Particle(NULL);
     particleEngine->setupEngine();
+
+    Mana::Event::trigger(CHANNEL_GAME, EVENT_ENGINESINITALIZED);
 }
 
 /**
@@ -145,6 +146,8 @@ static void initEngines()
  */
 static void createGuiWindows()
 {
+    Mana::Event::trigger(CHANNEL_GAME, EVENT_GUIWINDOWSLOADING);
+
     setupWindow->clearWindowsForReset();
 
     // Create dialogs
@@ -152,9 +155,19 @@ static void createGuiWindows()
     minimap = new Minimap;
     chatWindow = new ChatWindow;
     tradeWindow = new TradeWindow;
-    equipmentWindow = new EquipmentWindow(player_node->mEquipment.get());
+    switch (Net::getNetworkType())
+    {
+      case ServerInfo::TMWATHENA:
+        equipmentWindow = new TmwAthena::TaEquipmentWindow(
+                                                    PlayerInfo::getEquipment());
+        break;
+      case ServerInfo::MANASERV:
+      default:
+        equipmentWindow = new EquipmentWindow(PlayerInfo::getEquipment());
+        break;
+    }
     statusWindow = new StatusWindow;
-    inventoryWindow = new InventoryWindow(player_node->getInventory());
+    inventoryWindow = new InventoryWindow(PlayerInfo::getInventory());
     skillDialog = new SkillDialog;
     helpWindow = new HelpWindow;
     debugWindow = new DebugWindow;
@@ -168,12 +181,9 @@ static void createGuiWindows()
 
     localChatTab = new ChatTab(_("General"));
 
-    if (config.getValue("logToChat", 0))
-    {
-        logger->setChatWindow(chatWindow);
-    }
+    NpcDialog::setup();
 
-    Net::getGeneralHandler()->guiWindowsLoaded();
+    Mana::Event::trigger(CHANNEL_GAME, EVENT_GUIWINDOWSLOADED);
 }
 
 #define del_0(X) { delete X; X = 0; }
@@ -183,8 +193,8 @@ static void createGuiWindows()
  */
 static void destroyGuiWindows()
 {
-    Net::getGeneralHandler()->guiWindowsUnloaded();
-    logger->setChatWindow(NULL);
+    Mana::Event::trigger(CHANNEL_GAME, EVENT_GUIWINDOWSUNLOADING);
+
     del_0(localChatTab) // Need to do this first, so it can remove itself
     del_0(chatWindow)
     del_0(statusWindow)
@@ -201,12 +211,16 @@ static void destroyGuiWindows()
     del_0(outfitWindow)
     del_0(specialsWindow)
     del_0(socialWindow)
+
+    Mana::Event::trigger(CHANNEL_NPC, EVENT_CLOSEALL); // Cleanup remaining NPC dialogs
+
+    Mana::Event::trigger(CHANNEL_GAME, EVENT_GUIWINDOWSUNLOADED);
 }
 
 Game *Game::mInstance = 0;
 
 Game::Game():
-    mLastTarget(Being::UNKNOWN),
+    mLastTarget(ActorSprite::UNKNOWN),
     mCurrentMap(0), mMapName("")
 {
     assert(!mInstance);
@@ -230,10 +244,8 @@ Game::Game():
 
     initEngines();
 
-    Net::getGameHandler()->inGame();
-
     // Initialize beings
-    beingManager->setPlayer(player_node);
+    actorSpriteManager->setPlayer(player_node);
 
     /*
      * To prevent the server from sending data before the client
@@ -253,18 +265,21 @@ Game::Game():
         joystick = new Joystick(0);
 
     setupWindow->setInGame(true);
+
+    Mana::Event::trigger(CHANNEL_GAME, EVENT_CONSTRUCTED);
 }
 
 Game::~Game()
 {
+    Mana::Event::trigger(CHANNEL_GAME, EVENT_DESTRUCTING);
+
     delete mWindowMenu;
 
     destroyGuiWindows();
 
-    del_0(beingManager)
+    del_0(actorSpriteManager)
     if (Client::getState() != STATE_CHANGE_MAP)
         del_0(player_node)
-    del_0(floorItemManager)
     del_0(channelManager)
     del_0(commandHandler)
     del_0(joystick)
@@ -273,6 +288,8 @@ Game::~Game()
     del_0(mCurrentMap)
 
     mInstance = 0;
+
+    Mana::Event::trigger(CHANNEL_GAME, EVENT_DESTRUCTED);
 }
 
 static bool saveScreenshot()
@@ -284,7 +301,7 @@ static bool saveScreenshot()
     if (showip)
     {
         player_node->setShowIp(false);
-        beingManager->updatePlayerNames();
+        actorSpriteManager->updatePlayerNames();
         gui->draw();
     }
 
@@ -293,7 +310,7 @@ static bool saveScreenshot()
     if (showip)
     {
         player_node->setShowIp(true);
-        beingManager->updatePlayerNames();
+        actorSpriteManager->updatePlayerNames();
     }
 
     // Search for an unused screenshot name
@@ -311,7 +328,8 @@ static bool saveScreenshot()
         screenshotDirectory = std::string(PHYSFS_getUserDir());
     }
 
-    do {
+    do
+    {
         screenshotCount++;
         filenameSuffix.str("");
         filename.str("");
@@ -322,7 +340,8 @@ static bool saveScreenshot()
         testExists.open(filename.str().c_str(), std::ios::in);
         found = !testExists.is_open();
         testExists.close();
-    } while (!found);
+    }
+    while (!found);
 
     const bool success = ImageWriter::writePNG(screenshot, filename.str());
 
@@ -331,11 +350,11 @@ static bool saveScreenshot()
         std::stringstream chatlogentry;
         // TODO: Make it one complete gettext string below
         chatlogentry << _("Screenshot saved as ") << filenameSuffix.str();
-        localChatTab->chatLog(chatlogentry.str(), BY_SERVER);
+        SERVER_NOTICE(chatlogentry.str())
     }
     else
     {
-        localChatTab->chatLog(_("Saving screenshot failed!"), BY_SERVER);
+        SERVER_NOTICE(_("Saving screenshot failed!"))
         logger->log("Error: could not save screenshot.");
     }
 
@@ -349,7 +368,8 @@ void Game::logic()
     handleInput();
 
     // Handle all necessary game logic
-    beingManager->logic();
+    ActorSprite::actorLogic();
+    actorSpriteManager->logic();
     particleEngine->update();
     if (mCurrentMap)
         mCurrentMap->update();
@@ -407,7 +427,7 @@ void Game::handleInput()
 
             // send straight to gui for certain windows
             if (quitDialog || TextDialog::isActive() ||
-                NpcPostDialog::isActive())
+                    PlayerInfo::getNPCPostCount() > 0)
             {
                 try
                 {
@@ -465,7 +485,8 @@ void Game::handleInput()
             }
 
 
-            if (!chatWindow->isInputFocused() || (event.key.keysym.mod & KMOD_ALT))
+            if (!chatWindow->isInputFocused() || (event.key.keysym.mod &
+                                                  KMOD_ALT))
             {
                 if (keyboard.isKeyActive(keyboard.KEY_PREV_CHAT_TAB))
                 {
@@ -612,7 +633,7 @@ void Game::handleInput()
                             int y = player_node->getTileY();
 
                             FloorItem *item =
-                                floorItemManager->findByCoordinates(x, y);
+                                    actorSpriteManager->findItem(x, y);
 
                             // If none below the player, try the tile in front
                             // of the player
@@ -629,8 +650,7 @@ void Game::handleInput()
                                     default: break;
                                 }
 
-                                item = floorItemManager->findByCoordinates(
-                                        x, y);
+                                item = actorSpriteManager->findItem(x, y);
                             }
 
                             if (item)
@@ -709,16 +729,12 @@ void Game::handleInput()
                         unsigned int deflt = player_relations.getDefault();
                         if (deflt & PlayerRelation::TRADE)
                         {
-                            localChatTab->chatLog(
-                                        _("Ignoring incoming trade requests"),
-                                        BY_SERVER);
+                            SERVER_NOTICE(_("Ignoring incoming trade requests"))
                             deflt &= ~PlayerRelation::TRADE;
                         }
                         else
                         {
-                            localChatTab->chatLog(
-                                        _("Accepting incoming trade requests"),
-                                        BY_SERVER);
+                            SERVER_NOTICE(_("Accepting incoming trade requests"))
                             deflt |= PlayerRelation::TRADE;
                         }
 
@@ -764,7 +780,7 @@ void Game::handleInput()
         return;
 
     // Moving player around
-    if (player_node->isAlive() && !NPC::isTalking() &&
+    if (player_node->isAlive() && !PlayerInfo::isTalking() &&
         !chatWindow->isInputFocused() && !quitDialog && !TextDialog::isActive())
     {
         // Get the state of the keyboard keys
@@ -835,8 +851,8 @@ void Game::handleInput()
             if (!player_node->getTarget())
             {
                 // Only auto target Monsters
-                target = beingManager->findNearestLivingBeing(player_node,
-                         20, Being::MONSTER);
+                target = actorSpriteManager->findNearestLivingBeing(player_node,
+                                                    20, ActorSprite::MONSTER);
             }
             player_node->attack(target, newTarget);
         }
@@ -848,16 +864,16 @@ void Game::handleInput()
                     (joystick && joystick->buttonPressed(3))) &&
                 !keyboard.isKeyActive(keyboard.KEY_TARGET))
         {
-            Being::Type currentTarget = Being::UNKNOWN;
+            ActorSprite::Type currentTarget = ActorSprite::UNKNOWN;
             if (keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) ||
                     (joystick && joystick->buttonPressed(3)))
-                currentTarget = Being::MONSTER;
+                currentTarget = ActorSprite::MONSTER;
             else if (keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER))
-                currentTarget = Being::PLAYER;
+                currentTarget = ActorSprite::PLAYER;
             else if (keyboard.isKeyActive(keyboard.KEY_TARGET_NPC))
-                currentTarget = Being::NPC;
+                currentTarget = ActorSprite::NPC;
 
-            Being *target = beingManager->findNearestLivingBeing(player_node,
+            Being *target = actorSpriteManager->findNearestLivingBeing(player_node,
                                                     20, currentTarget);
 
             if (target && (target != player_node->getTarget() ||
@@ -869,7 +885,7 @@ void Game::handleInput()
         }
         else
         {
-            mLastTarget = Being::UNKNOWN; // Reset last target
+            mLastTarget = ActorSprite::UNKNOWN; // Reset last target
         }
 
         // Talk to the nearest NPC if 't' pressed
@@ -880,8 +896,8 @@ void Game::handleInput()
 
             if (target)
             {
-                if (target->getType() == Being::NPC)
-                    static_cast<NPC*>(target)->talk();
+                if (target->canTalk())
+                    target->talkTo();
             }
         }
 
@@ -899,7 +915,7 @@ void Game::handleInput()
                 const int x = player_node->getTileX();
                 const int y = player_node->getTileY();
 
-                FloorItem *item = floorItemManager->findByCoordinates(x, y);
+                FloorItem *item = actorSpriteManager->findItem(x, y);
 
                 if (item)
                     player_node->pickUp(item);
@@ -919,8 +935,7 @@ void Game::handleInput()
 void Game::changeMap(const std::string &mapPath)
 {
     // Clean up floor items, beings and particles
-    floorItemManager->clear();
-    beingManager->clear();
+    actorSpriteManager->clear();
 
     // Close the popup menu on map change so that invalid options can't be
     // executed.
@@ -953,7 +968,7 @@ void Game::changeMap(const std::string &mapPath)
 
     // Notify the minimap and beingManager about the map change
     minimap->setMap(newMap);
-    beingManager->setMap(newMap);
+    actorSpriteManager->setMap(newMap);
     particleEngine->setMap(newMap);
     viewport->setMap(newMap);
 
@@ -975,5 +990,7 @@ void Game::changeMap(const std::string &mapPath)
     delete mCurrentMap;
     mCurrentMap = newMap;
 
-    Net::getGameHandler()->mapLoaded(mapPath);
+    Mana::Event event(EVENT_MAPLOADED);
+    event.setString("mapPath", mapPath);
+    event.trigger(CHANNEL_GAME);
 }
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 9815e1ad..24f92544 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -27,12 +27,15 @@
 #include "resources/image.h"
 #include "resources/imageloader.h"
 
+#include <SDL_gfxBlitFunc.h>
+
 Graphics::Graphics():
     mWidth(0),
     mHeight(0),
     mBpp(0),
     mFullscreen(false),
-    mHWAccel(false)
+    mHWAccel(false),
+    mBlitMode(BLIT_NORMAL)
 {
 }
 
@@ -183,7 +186,10 @@ bool Graphics::drawImage(Image *image, int srcX, int srcY, int dstX, int dstY,
     srcRect.w = width;
     srcRect.h = height;
 
-    return !(SDL_BlitSurface(image->mSDLSurface, &srcRect, mTarget, &dstRect) < 0);
+    if (mBlitMode == BLIT_NORMAL)
+        return !(SDL_BlitSurface(image->mSDLSurface, &srcRect, mTarget, &dstRect) < 0);
+    else
+        return !(SDL_gfxBlitRGBA(image->mSDLSurface, &srcRect, mTarget, &dstRect) < 0);
 }
 
 void Graphics::drawImage(gcn::Image const *image, int srcX, int srcY,
diff --git a/src/graphics.h b/src/graphics.h
index 211fb901..344c31c3 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -73,6 +73,11 @@ struct ImageRect
 class Graphics : public gcn::SDLGraphics
 {
     public:
+        enum BlitMode {
+            BLIT_NORMAL = 0,
+            BLIT_GFX
+        };
+
         /**
          * Constructor.
          */
@@ -182,6 +187,12 @@ class Graphics : public gcn::SDLGraphics
             drawImageRect(area.x, area.y, area.width, area.height, imgRect);
         }
 
+        void setBlitMode(BlitMode mode)
+        { mBlitMode = mode; }
+
+        BlitMode getBlitMode()
+        { return mBlitMode; }
+
         /**
          * Updates the screen. This is done by either copying the buffer to the
          * screen or swapping pages.
@@ -211,6 +222,7 @@ class Graphics : public gcn::SDLGraphics
         int mBpp;
         bool mFullscreen;
         bool mHWAccel;
+        BlitMode mBlitMode;
 };
 
 extern Graphics *graphics;
diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp
index 2150f7e5..ae0b43fd 100644
--- a/src/gui/beingpopup.cpp
+++ b/src/gui/beingpopup.cpp
@@ -20,8 +20,8 @@
 
 #include "gui/beingpopup.h"
 
+#include "being.h"
 #include "graphics.h"
-#include "player.h"
 #include "units.h"
 
 #include "gui/gui.h"
@@ -57,24 +57,24 @@ BeingPopup::~BeingPopup()
 {
 }
 
-void BeingPopup::show(int x, int y, Player *p)
+void BeingPopup::show(int x, int y, Being *b)
 {
-    if (!p)
+    if (!b)
     {
         setVisible(false);
         return;
     }
 
-    mBeingName->setCaption(p->getName());
+    mBeingName->setCaption(b->getName());
     mBeingName->adjustSize();
 
     int minWidth = mBeingName->getWidth();
     const int height = getFont()->getHeight();
 
-    if (!(p->getPartyName().empty()))
+    if (!(b->getPartyName().empty()))
     {
         mBeingParty->setCaption(strprintf(_("Party: %s"),
-                                          p->getPartyName().c_str()));
+                                          b->getPartyName().c_str()));
         mBeingParty->adjustSize();
 
         if (minWidth < mBeingParty->getWidth())
diff --git a/src/gui/beingpopup.h b/src/gui/beingpopup.h
index f397e374..514a6e7e 100644
--- a/src/gui/beingpopup.h
+++ b/src/gui/beingpopup.h
@@ -23,8 +23,8 @@
 
 #include "gui/widgets/popup.h"
 
+class Being;
 class Label;
-class Player;
 
 /**
  * A popup that displays information about a being.
@@ -45,7 +45,7 @@ class BeingPopup : public Popup
         /**
          * Sets the info to be displayed given a particular player.
          */
-        void show(int x, int y, Player *p);
+        void show(int x, int y, Being *b);
 
         // TODO: Add a version for monsters, NPCs, etc?
 
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index faa86cc9..4a8dae17 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -21,6 +21,10 @@
 
 #include "gui/buy.h"
 
+#include "playerinfo.h"
+#include "shopitem.h"
+#include "units.h"
+
 #include "gui/setup.h"
 
 #include "gui/widgets/button.h"
@@ -31,10 +35,6 @@
 #include "gui/widgets/shoplistbox.h"
 #include "gui/widgets/slider.h"
 
-#include "npc.h"
-#include "shopitem.h"
-#include "units.h"
-
 #include "net/net.h"
 #include "net/npchandler.h"
 
@@ -112,6 +112,8 @@ BuyDialog::BuyDialog(int npcId):
 
     instances.push_back(this);
     setVisible(true);
+
+    PlayerInfo::setBuySellState(BUYSELL_BUYING);
 }
 
 BuyDialog::~BuyDialog()
@@ -119,6 +121,9 @@ BuyDialog::~BuyDialog()
     delete mShopItems;
 
     instances.remove(this);
+
+    if (PlayerInfo::getBuySellState() == BUYSELL_BUYING)
+        PlayerInfo::setBuySellState(BUYSELL_NONE);
 }
 
 void BuyDialog::setMoney(int amount)
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 4b273bcc..c3cb3229 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -100,11 +100,6 @@ class BuyDialog : public Window, public gcn::ActionListener,
         void setVisible(bool visible);
 
         /**
-         * Returns true if any instances exist.
-         */
-        static bool isActive() { return instances.size() > 0; }
-
-        /**
          * Closes all instances.
          */
         static void closeAll();
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index c6b4ef41..4419ffcc 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -21,7 +21,7 @@
 
 #include "buysell.h"
 
-#include "npc.h"
+#include "playerinfo.h"
 
 #include "gui/setup.h"
 
@@ -67,11 +67,16 @@ BuySellDialog::BuySellDialog(int npcId):
 
     instances.push_back(this);
     setVisible(true);
+
+    PlayerInfo::setBuySellState(BUYSELL_CHOOSING);
 }
 
 BuySellDialog::~BuySellDialog()
 {
     instances.remove(this);
+
+    if (PlayerInfo::getBuySellState() == BUYSELL_CHOOSING)
+        PlayerInfo::setBuySellState(BUYSELL_NONE);
 }
 
 void BuySellDialog::setVisible(bool visible)
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index cf7ec91e..3408821a 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -52,11 +52,6 @@ class BuySellDialog : public Window, public gcn::ActionListener
         void action(const gcn::ActionEvent &event);
 
         /**
-         * Returns true if any instances exist.
-         */
-        static bool isActive() { return instances.size() > 0; }
-
-        /**
          * Closes all instances.
          */
         static void closeAll();
diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h
index 7e5f04fa..84838d15 100644
--- a/src/gui/changeemaildialog.h
+++ b/src/gui/changeemaildialog.h
@@ -22,8 +22,6 @@
 #ifndef GUI_CHANGEEMAIL_H
 #define GUI_CHANGEEMAIL_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h
index 361debe4..d356a5df 100644
--- a/src/gui/changepassworddialog.h
+++ b/src/gui/changepassworddialog.h
@@ -22,8 +22,6 @@
 #ifndef CHANGEPASSWORDDIALOG_H
 #define CHANGEPASSWORDDIALOG_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index e4a5fd01..746295b5 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -54,7 +54,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *parent, int slot):
     mCharSelectDialog(parent),
     mSlot(slot)
 {
-    mPlayer = new Player(0, 0, NULL);
+    mPlayer = new Being(0, ActorSprite::PLAYER, 0, NULL);
     mPlayer->setGender(GENDER_MALE);
 
     int numberOfHairColors = ColorDB::size();
@@ -65,10 +65,10 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *parent, int slot):
 
     mNameField = new TextField("");
     mNameLabel = new Label(_("Name:"));
-    // TRANSLATORS: This is a narrow symbol used to denote 'next'.
+    // TRANSLATORS: This is an arrow symbol used to denote 'next'.
     // You may change this symbol if your language uses another.
     mNextHairColorButton = new Button(_(">"), "nextcolor", this);
-    // TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+    // TRANSLATORS: This is an arrow symbol used to denote 'previous'.
     // You may change this symbol if your language uses another.
     mPrevHairColorButton = new Button(_("<"), "prevcolor", this);
     mHairColorLabel = new Label(_("Hair color:"));
@@ -156,7 +156,8 @@ void CharCreateDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "create")
     {
-        if (getName().length() >= 4)
+        if (Net::getNetworkType() == ServerInfo::MANASERV
+            || getName().length() >= 4)
         {
             // Attempt to create the character
             mCreateButton->setEnabled(false);
@@ -167,7 +168,12 @@ void CharCreateDialog::action(const gcn::ActionEvent &event)
                 atts.push_back((int) mAttributeSlider[i]->getValue());
             }
 
-            Net::getCharHandler()->newCharacter(getName(), mSlot,
+            int characterSlot = mSlot;
+            // On Manaserv, the slots start at 1, so we offset them.
+            if (Net::getNetworkType() == ServerInfo::MANASERV)
+                ++characterSlot;
+
+            Net::getCharHandler()->newCharacter(getName(), characterSlot,
                                                 mFemale->isSelected(),
                                                 mHairStyle,
                                                 mHairColor, atts);
@@ -277,7 +283,8 @@ int CharCreateDialog::getDistributedPoints() const
 }
 
 void CharCreateDialog::setAttributes(const std::vector<std::string> &labels,
-                                     int available, int min, int max)
+                                     unsigned int available, unsigned int min,
+                                     unsigned int max)
 {
     mMaxPoints = available;
 
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index 902e650e..d6b6d390 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -22,7 +22,7 @@
 #ifndef CHAR_CREATE_DIALOG_H
 #define CHAR_CREATE_DIALOG_H
 
-#include "player.h"
+#include "being.h"
 #include "guichanfwd.h"
 
 #include "gui/charselectdialog.h"
@@ -63,8 +63,8 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         void unlock();
 
         void setAttributes(const std::vector<std::string> &labels,
-                           int available,
-                           int min, int max);
+                           unsigned int available,
+                           unsigned int min, unsigned int max);
 
         void setFixedGender(bool fixed, Gender gender = GENDER_FEMALE);
 
@@ -110,7 +110,7 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         gcn::Button *mCreateButton;
         gcn::Button *mCancelButton;
 
-        Player *mPlayer;
+        Being *mPlayer;
         PlayerBox *mPlayerBox;
 
         int mHairStyle;
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index f8c28c6a..42c514ec 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -59,6 +59,9 @@
 #include <string>
 #include <cassert>
 
+// Character slots per row in the dialog
+static const int SLOTS_PER_ROW = 5;
+
 /**
  * Listener for confirming character deletion.
  */
@@ -118,6 +121,7 @@ CharSelectDialog::CharSelectDialog(LoginData *loginData):
     mLocked(false),
     mUnregisterButton(0),
     mChangeEmailButton(0),
+    mCharacterEntries(0),
     mLoginData(loginData),
     mCharHandler(Net::getCharHandler())
 {
@@ -154,9 +158,10 @@ CharSelectDialog::CharSelectDialog(LoginData *loginData):
 
     place = getPlacer(0, 1);
 
-    for (int i = 0; i < MAX_CHARACTER_COUNT; i++) {
-        mCharacterEntries[i] = new CharacterDisplay(this);
-        place(i, 0, mCharacterEntries[i]);
+    for (int i = 0; i < (int)mLoginData->characterSlots; i++)
+    {
+        mCharacterEntries.push_back(new CharacterDisplay(this));
+        place(i % SLOTS_PER_ROW, (int)i / SLOTS_PER_ROW, mCharacterEntries[i]);
     }
 
     reflowLayout();
@@ -179,9 +184,14 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
     // Check if a button of a character was pressed
     const gcn::Widget *sourceParent = event.getSource()->getParent();
     int selected = -1;
-    for (int i = 0; i < MAX_CHARACTER_COUNT; ++i)
+    for (int i = 0; i < (int)mCharacterEntries.size(); ++i)
+    {
         if (mCharacterEntries[i] == sourceParent)
+        {
             selected = i;
+            break;
+        }
+    }
 
     const std::string &eventId = event.getId();
 
@@ -191,7 +201,8 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
         {
             attemptCharacterSelect(selected);
         }
-        else if (eventId == "new" && !mCharacterEntries[selected]->getCharacter())
+        else if (eventId == "new"
+                 && !mCharacterEntries[selected]->getCharacter())
         {
             // Start new character dialog
             CharCreateDialog *charCreateDialog =
@@ -261,19 +272,29 @@ void CharSelectDialog::attemptCharacterSelect(int index)
 void CharSelectDialog::setCharacters(const Net::Characters &characters)
 {
     // Reset previous characters
-    for (int i = 0; i < MAX_CHARACTER_COUNT; ++i)
-        mCharacterEntries[i]->setCharacter(0);
+    std::vector<CharacterDisplay*>::iterator iter, iter_end;
+    for (iter = mCharacterEntries.begin(), iter_end = mCharacterEntries.end();
+         iter != iter_end; ++iter)
+        (*iter)->setCharacter(0);
 
     Net::Characters::const_iterator i, i_end = characters.end();
     for (i = characters.begin(); i != i_end; ++i)
     {
         Net::Character *character = *i;
-        if (character->slot >= MAX_CHARACTER_COUNT) {
+
+        // Slots Number start at 1 for Manaserv, so we offset them by one.
+        int characterSlot = character->slot;
+        if (Net::getNetworkType() == ServerInfo::MANASERV
+            && characterSlot > 0)
+            --characterSlot;
+
+        if (characterSlot >= (int)mCharacterEntries.size())
+        {
             logger->log("Warning: slot out of range: %d", character->slot);
             continue;
         }
 
-        mCharacterEntries[character->slot]->setCharacter(character);
+        mCharacterEntries[characterSlot]->setCharacter(character);
     }
 }
 
@@ -299,7 +320,7 @@ void CharSelectDialog::setLocked(bool locked)
     if (mChangeEmailButton)
         mChangeEmailButton->setEnabled(!locked);
 
-    for (int i = 0; i < MAX_CHARACTER_COUNT; ++i)
+    for (int i = 0; i < (int)mCharacterEntries.size(); ++i)
         mCharacterEntries[i]->setActive(!mLocked);
 }
 
@@ -309,9 +330,12 @@ bool CharSelectDialog::selectByName(const std::string &name,
     if (mLocked)
         return false;
 
-    for (int i = 0; i < MAX_CHARACTER_COUNT; ++i) {
-        if (Net::Character *character = mCharacterEntries[i]->getCharacter()) {
-            if (character->dummy->getName() == name) {
+    for (int i = 0; i < (int)mCharacterEntries.size(); ++i)
+    {
+        if (Net::Character *character = mCharacterEntries[i]->getCharacter())
+        {
+            if (character->dummy->getName() == name)
+            {
                 mCharacterEntries[i]->requestFocus();
                 if (action == Choose)
                     attemptCharacterSelect(i);
@@ -380,8 +404,10 @@ void CharacterDisplay::update()
         mButton->setCaption(_("Choose"));
         mButton->setActionEventId("use");
         mName->setCaption(strprintf("%s", character->getName().c_str()));
-        mLevel->setCaption(strprintf("Level %d", character->getLevel()));
-        mMoney->setCaption(Units::formatCurrency(character->getMoney()));
+        mLevel->setCaption(strprintf("Level %d",
+                           mCharacter->data.mAttributes[LEVEL]));
+        mMoney->setCaption(Units::formatCurrency(
+                           mCharacter->data.mAttributes[MONEY]));
 
         mDelete->setVisible(true);
     }
diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h
index b6e71715..455ec2df 100644
--- a/src/gui/charselectdialog.h
+++ b/src/gui/charselectdialog.h
@@ -22,10 +22,6 @@
 #ifndef CHAR_SELECT_H
 #define CHAR_SELECT_H
 
-#include "guichanfwd.h"
-#include "main.h"
-#include "player.h"
-
 #include "gui/widgets/window.h"
 
 #include "net/charhandler.h"
@@ -100,8 +96,8 @@ class CharSelectDialog : public Window, public gcn::ActionListener,
         gcn::Button *mUnregisterButton;
         gcn::Button *mChangeEmailButton;
 
-        enum { MAX_CHARACTER_COUNT = 3 };
-        CharacterDisplay *mCharacterEntries[MAX_CHARACTER_COUNT];
+        /** The player boxes */
+        std::vector<CharacterDisplay*> mCharacterEntries;
 
         LoginData *mLoginData;
 
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 6d900e98..2ac5100d 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -21,10 +21,11 @@
 
 #include "chat.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
 #include "configuration.h"
 #include "localplayer.h"
 #include "party.h"
+#include "playerrelations.h"
 
 #include "gui/recorder.h"
 #include "gui/setup.h"
@@ -89,6 +90,9 @@ ChatWindow::ChatWindow():
     mAutoComplete(new ChatAutoComplete),
     mTmpVisible(false)
 {
+    listen(CHANNEL_CHAT);
+    listen(CHANNEL_NOTICES);
+
     setWindowName("Chat");
 
     setupWindow->registerWindowForReset(this);
@@ -119,7 +123,7 @@ ChatWindow::ChatWindow():
     mChatInput->setHistory(mHistory);
     mChatInput->setAutoComplete(mAutoComplete);
 
-    mReturnToggles = config.getValue("ReturnToggles", "0") == "1";
+    mReturnToggles = config.getBoolValue("ReturnToggles");
 
     mRecorder = new Recorder(this);
 }
@@ -286,20 +290,20 @@ void ChatWindow::chatInput(const std::string &msg)
 
 void ChatWindow::doPresent()
 {
-    const Beings &beings = beingManager->getAll();
+    const ActorSprites &actors = actorSpriteManager->getAll();
     std::string response = "";
     int playercount = 0;
 
-    for (Beings::const_iterator bi = beings.begin(), be = beings.end();
-         bi != be; ++bi)
+    for (ActorSpritesConstIterator it = actors.begin(), it_end = actors.end();
+         it != it_end; it++)
     {
-        if ((*bi)->getType() == Being::PLAYER)
+        if ((*it)->getType() == ActorSprite::PLAYER)
         {
             if (!response.empty())
             {
                 response += ", ";
             }
-            response += (*bi)->getName();
+            response += static_cast<Being*>(*it)->getName();
             ++playercount;
         }
     }
@@ -371,6 +375,40 @@ void ChatWindow::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
+void ChatWindow::event(Channels channel, const Mana::Event &event)
+{
+    if (channel == CHANNEL_NOTICES)
+    {
+        if (event.getName() == EVENT_SERVERNOTICE)
+            localChatTab->chatLog(event.getString("message"), BY_SERVER);
+    }
+    else if (channel == CHANNEL_CHAT)
+    {
+        if (event.getName() == EVENT_WHISPER)
+        {
+            whisper(event.getString("nick"), event.getString("message"));
+        }
+        else if (event.getName() == EVENT_WHISPERERROR)
+        {
+            whisper(event.getString("nick"),
+                    event.getString("error"), BY_SERVER);
+        }
+        else if (event.getName() == EVENT_PLAYER)
+        {
+            localChatTab->chatLog(event.getString("message"), BY_PLAYER);
+        }
+        else if (event.getName() == EVENT_ANNOUNCEMENT)
+        {
+            localChatTab->chatLog(event.getString("message"), BY_GM);
+        }
+        else if (event.getName() == EVENT_BEING)
+        {
+            if (event.getInt("permissions") & PlayerRelation::SPEECH_LOG)
+                localChatTab->chatLog(event.getString("message"), BY_OTHER);
+        }
+    }
+}
+
 void ChatWindow::addInputText(const std::string &text)
 {
     const int caretPos = mChatInput->getCaretPosition();
@@ -409,7 +447,7 @@ void ChatWindow::setRecordingFile(const std::string &msg)
 }
 
 void ChatWindow::whisper(const std::string &nick,
-                         const std::string &mes, bool own)
+                         const std::string &mes, Own own)
 {
     if (mes.empty())
         return;
@@ -428,15 +466,19 @@ void ChatWindow::whisper(const std::string &nick,
 
     if (i != mWhispers.end())
         tab = i->second;
-    else if (config.getValue("whispertab", true))
+    else if (config.getBoolValue("whispertab"))
         tab = addWhisperTab(nick);
 
     if (tab)
     {
-        if (own)
+        if (own == BY_PLAYER)
         {
             tab->chatInput(mes);
         }
+        else if (own == BY_SERVER)
+        {
+            tab->chatLog(mes);
+        }
         else
         {
             tab->chatLog(nick, mes);
@@ -445,7 +487,7 @@ void ChatWindow::whisper(const std::string &nick,
     }
     else
     {
-        if (own)
+        if (own == BY_PLAYER)
         {
             Net::getChatHandler()->privateMessage(nick, mes);
 
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 1c673556..f546502c 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -22,6 +22,8 @@
 #ifndef CHAT_H
 #define CHAT_H
 
+#include "listener.h"
+
 #include "gui/widgets/window.h"
 #include "gui/widgets/textfield.h"
 
@@ -36,8 +38,8 @@
 #include <vector>
 
 class BrowserBox;
-class Channel;
 class ChatTab;
+class Channel;
 class ChatInput;
 class Recorder;
 class ScrollArea;
@@ -48,12 +50,24 @@ class WhisperTab;
 
 #define DEFAULT_CHAT_WINDOW_SCROLL 7 // 1 means `1/8th of the window size'.
 
+enum Own
+{
+    BY_GM,
+    BY_PLAYER,
+    BY_OTHER,
+    BY_SERVER,
+    BY_CHANNEL,
+    ACT_WHISPER,      // getting whispered at
+    ACT_IS,           // equivalent to "/me" on IRC
+    BY_LOGGER
+};
+
 /** One item in the chat log */
 struct CHATLOG
 {
     std::string nick;
     std::string text;
-    int own;
+    Own own;
 };
 
 /**
@@ -62,7 +76,8 @@ struct CHATLOG
  * \ingroup Interface
  */
 class ChatWindow : public Window,
-                   public gcn::ActionListener
+                   public gcn::ActionListener,
+                   public Mana::Listener
 {
     public:
         /**
@@ -143,6 +158,8 @@ class ChatWindow : public Window,
 	void mousePressed(gcn::MouseEvent &event);
 	void mouseDragged(gcn::MouseEvent &event);
 
+        void event(Channels channel, const Mana::Event &event);
+
         /**
          * Scrolls the chat window
          *
@@ -165,7 +182,7 @@ class ChatWindow : public Window,
         void doPresent();
 
         void whisper(const std::string &nick, const std::string &mes,
-                     bool own = false);
+                     Own own = BY_OTHER);
 
         ChatTab *addWhisperTab(const std::string &nick, bool switchTo = false);
 
diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp
index 7c05e263..bd40a932 100644
--- a/src/gui/emotepopup.cpp
+++ b/src/gui/emotepopup.cpp
@@ -22,18 +22,17 @@
 
 #include "gui/emotepopup.h"
 
-#include "animatedsprite.h"
+#include "imagesprite.h"
 #include "configuration.h"
 #include "emoteshortcut.h"
 #include "graphics.h"
 #include "localplayer.h"
 #include "log.h"
 
-#include "gui/theme.h"
-
 #include "resources/emotedb.h"
 #include "resources/image.h"
 #include "resources/iteminfo.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 
@@ -54,14 +53,14 @@ EmotePopup::EmotePopup():
     // Setup emote sprites
     for (int i = 0; i <= EmoteDB::getLast(); ++i)
     {
-        mEmotes.push_back(EmoteDB::getAnimation(i));
+        mEmotes.push_back(EmoteDB::get(i)->sprite);
     }
 
     mSelectionImage = Theme::getImageFromTheme("selection.png");
     if (!mSelectionImage)
         logger->error("Unable to load selection.png");
 
-    mSelectionImage->setAlpha(config.getValue("guialpha", 0.8));
+    mSelectionImage->setAlpha(config.getFloatValue("guialpha"));
 
     addMouseListener(this);
     recalculateSize();
diff --git a/src/gui/emotepopup.h b/src/gui/emotepopup.h
index 62a3f24a..d2cabc44 100644
--- a/src/gui/emotepopup.h
+++ b/src/gui/emotepopup.h
@@ -30,7 +30,7 @@
 #include <list>
 #include <vector>
 
-class AnimatedSprite;
+class ImageSprite;
 class Image;
 
 namespace gcn {
@@ -105,7 +105,7 @@ class EmotePopup : public Popup
          */
         void distributeValueChangedEvent();
 
-        std::vector<const AnimatedSprite*> mEmotes;
+        std::vector<const ImageSprite*> mEmotes;
         Image *mSelectionImage;
         int mSelectedEmoteIndex;
         int mHoveredEmoteIndex;
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 43e330f4..02fc2a96 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -29,7 +29,6 @@
 
 #include "gui/equipmentwindow.h"
 #include "gui/itempopup.h"
-#include "gui/theme.h"
 #include "gui/setup.h"
 #include "gui/viewport.h"
 
@@ -41,6 +40,7 @@
 #include "resources/image.h"
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
+#include "resources/theme.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -67,8 +67,9 @@ static const int boxPosition[][2] = {
 
 EquipmentWindow::EquipmentWindow(Equipment *equipment):
     Window(_("Equipment")),
-    mEquipment(equipment),
-    mSelected(-1)
+    mEquipBox(0),
+    mSelected(-1),
+    mEquipment(equipment)
 {
     mItemPopup = new ItemPopup;
     setupWindow->registerWindowForReset(this);
@@ -92,12 +93,6 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment):
 
     add(playerBox);
     add(mUnequip);
-
-    for (int i = 0; i < Equipment::EQUIP_VECTOREND; i++)
-    {
-        mEquipBox[i].posX = boxPosition[i][0] + getPadding();
-        mEquipBox[i].posY = boxPosition[i][1] + getTitleBarHeight();
-    }
 }
 
 EquipmentWindow::~EquipmentWindow()
@@ -110,47 +105,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
     // Draw window graphics
     Window::draw(graphics);
 
-    Graphics *g = static_cast<Graphics*>(graphics);
-
     Window::drawChildren(graphics);
-
-    for (int i = 0; i < Equipment::EQUIP_VECTOREND; i++)
-    {
-        if (i == mSelected)
-        {
-            const gcn::Color color = Theme::getThemeColor(Theme::HIGHLIGHT);
-
-            // Set color to the highlight color
-            g->setColor(gcn::Color(color.r, color.g, color.b, getGuiAlpha()));
-            g->fillRectangle(gcn::Rectangle(mEquipBox[i].posX, mEquipBox[i].posY,
-                                            BOX_WIDTH, BOX_HEIGHT));
-        }
-
-        // Set color black
-        g->setColor(gcn::Color(0, 0, 0));
-        // Draw box border
-        g->drawRectangle(gcn::Rectangle(mEquipBox[i].posX, mEquipBox[i].posY,
-                                        BOX_WIDTH, BOX_HEIGHT));
-
-        Item *item = mEquipment->getEquipment(i);
-        if (item)
-        {
-            // Draw Item.
-            Image *image = item->getImage();
-            image->setAlpha(1.0f); // Ensure the image is drawn with maximum opacity
-            g->drawImage(image,
-                         mEquipBox[i].posX + 2,
-                         mEquipBox[i].posY + 2);
-            if (i == EQUIP_PROJECTILE_SLOT)
-            {
-                g->setColor(Theme::getThemeColor(Theme::TEXT));
-                graphics->drawText(toString(item->getQuantity()),
-                                   mEquipBox[i].posX + (BOX_WIDTH / 2),
-                                   mEquipBox[i].posY - getFont()->getHeight(),
-                                   gcn::Graphics::CENTER);
-            }
-        }
-    }
 }
 
 void EquipmentWindow::action(const gcn::ActionEvent &event)
@@ -158,21 +113,22 @@ void EquipmentWindow::action(const gcn::ActionEvent &event)
     if (event.getId() == "unequip" && mSelected > -1)
     {
         Item *item = mEquipment->getEquipment(mSelected);
-        Net::getInventoryHandler()->unequipItem(item);
+        item->doEvent(EVENT_DOUNEQUIP);
         setSelected(-1);
     }
 }
 
 Item *EquipmentWindow::getItem(int x, int y) const
 {
-    for (int i = 0; i < Equipment::EQUIP_VECTOREND; i++)
+    if (Net::getNetworkType() == ServerInfo::TMWATHENA)
     {
-        gcn::Rectangle tRect(mEquipBox[i].posX, mEquipBox[i].posY,
-                             BOX_WIDTH, BOX_HEIGHT);
-
-        if (tRect.isPointInRect(x, y))
+        for (int i = 0; i < TmwAthena::EQUIP_VECTOR_END; i++)
         {
-            return mEquipment->getEquipment(i);
+            gcn::Rectangle tRect(mEquipBox[i].posX, mEquipBox[i].posY,
+                                 BOX_WIDTH, BOX_HEIGHT);
+
+            if (tRect.isPointInRect(x, y))
+                return mEquipment->getEquipment(i);
         }
     }
     return NULL;
@@ -188,14 +144,17 @@ void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
     if (mouseEvent.getButton() == gcn::MouseEvent::LEFT)
     {
         // Checks if any of the presses were in the equip boxes.
-        for (int i = 0; i < Equipment::EQUIP_VECTOREND; i++)
+        if (Net::getNetworkType() == ServerInfo::TMWATHENA)
         {
-            Item *item = mEquipment->getEquipment(i);
-            gcn::Rectangle tRect(mEquipBox[i].posX, mEquipBox[i].posY,
-                                 BOX_WIDTH, BOX_HEIGHT);
+            for (int i = 0; i < TmwAthena::EQUIP_VECTOR_END; i++)
+            {
+                Item *item = mEquipment->getEquipment(i);
+                gcn::Rectangle tRect(mEquipBox[i].posX, mEquipBox[i].posY,
+                                     BOX_WIDTH, BOX_HEIGHT);
 
-            if (tRect.isPointInRect(x, y) && item)
-                setSelected(i);
+                if (tRect.isPointInRect(x, y) && item)
+                    setSelected(i);
+            }
         }
     }
     else if (mouseEvent.getButton() == gcn::MouseEvent::RIGHT)
@@ -245,3 +204,71 @@ void EquipmentWindow::setSelected(int index)
     mSelected = index;
     mUnequip->setEnabled(mSelected != -1);
 }
+
+namespace TmwAthena {
+
+TaEquipmentWindow::TaEquipmentWindow(Equipment *equipment):
+    EquipmentWindow(equipment)
+{
+    // Load equipment boxes.
+    mEquipBox = new EquipBox[TmwAthena::EQUIP_VECTOR_END];
+
+    for (int i = 0; i < TmwAthena::EQUIP_VECTOR_END; i++)
+    {
+        mEquipBox[i].posX = boxPosition[i][0] + getPadding();
+        mEquipBox[i].posY = boxPosition[i][1] + getTitleBarHeight();
+    }
+}
+
+TaEquipmentWindow::~TaEquipmentWindow()
+{
+    delete[] mEquipBox;
+}
+
+void TaEquipmentWindow::draw(gcn::Graphics *graphics)
+{
+    EquipmentWindow::draw(graphics);
+
+    // Draw equipment boxes
+    Graphics *g = static_cast<Graphics*>(graphics);
+
+    for (int i = 0; i < TmwAthena::EQUIP_VECTOR_END; i++)
+    {
+        if (i == mSelected)
+        {
+            const gcn::Color color = Theme::getThemeColor(Theme::HIGHLIGHT);
+
+            // Set color to the highlight color
+            g->setColor(gcn::Color(color.r, color.g, color.b, getGuiAlpha()));
+            g->fillRectangle(gcn::Rectangle(mEquipBox[i].posX, mEquipBox[i].posY,
+                                            BOX_WIDTH, BOX_HEIGHT));
+        }
+
+        // Set color black
+        g->setColor(gcn::Color(0, 0, 0));
+        // Draw box border
+        g->drawRectangle(gcn::Rectangle(mEquipBox[i].posX, mEquipBox[i].posY,
+                                        BOX_WIDTH, BOX_HEIGHT));
+
+        Item *item = mEquipment->getEquipment(i);
+        if (item)
+        {
+            // Draw Item.
+            Image *image = item->getImage();
+            image->setAlpha(1.0f); // Ensure the image is drawn with maximum opacity
+            g->drawImage(image,
+                          mEquipBox[i].posX + 2,
+                          mEquipBox[i].posY + 2);
+            if (i == TmwAthena::EQUIP_PROJECTILE_SLOT)
+            {
+                g->setColor(Theme::getThemeColor(Theme::TEXT));
+                graphics->drawText(toString(item->getQuantity()),
+                                    mEquipBox[i].posX + (BOX_WIDTH / 2),
+                                    mEquipBox[i].posY - getFont()->getHeight(),
+                                    gcn::Graphics::CENTER);
+            }
+        }
+    }
+}
+
+};
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 5688bf30..a0fa6acb 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -23,7 +23,6 @@
 #define EQUIPMENTWINDOW_H
 
 #include "equipment.h"
-#include "guichanfwd.h"
 
 #include "gui/widgets/window.h"
 
@@ -60,6 +59,21 @@ class EquipmentWindow : public Window, public gcn::ActionListener
 
         void mousePressed(gcn::MouseEvent& mouseEvent);
 
+  protected:
+        /**
+         * Equipment box.
+         */
+        struct EquipBox
+        {
+            int posX;
+            int posY;
+        };
+
+        EquipBox *mEquipBox; /**< Equipment Boxes. */
+
+        int mSelected; /**< Index of selected item. */
+        Equipment *mEquipment;
+
     private:
         void mouseExited(gcn::MouseEvent &event);
         void mouseMoved(gcn::MouseEvent &event);
@@ -68,25 +82,34 @@ class EquipmentWindow : public Window, public gcn::ActionListener
 
         void setSelected(int index);
 
-        Equipment *mEquipment;
+        ItemPopup *mItemPopup;
+        gcn::Button *mUnequip;
+};
 
+namespace TmwAthena {
+
+class TaEquipmentWindow : public EquipmentWindow
+{
+    public:
         /**
-         * Equipment box.
+         * Constructor.
          */
-        struct EquipBox
-        {
-            int posX;
-            int posY;
-        };
+        TaEquipmentWindow(Equipment *equipment);
 
-        EquipBox mEquipBox[Equipment::EQUIP_VECTOREND]; /**< Equipment Boxes. */
+        /**
+         * Destructor.
+         */
+        ~TaEquipmentWindow();
 
-        ItemPopup *mItemPopup;
-        gcn::Button *mUnequip;
+        /**
+         * Draws the equipment window using TmwAthena routine.
+         */
+        void draw(gcn::Graphics *graphics);
 
-        int mSelected; /**< Index of selected item. */
 };
 
+}; // namespace TmwAthena
+
 extern EquipmentWindow *equipmentWindow;
 
 #endif
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 75f67435..c0d1babf 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -24,14 +24,13 @@
 #include "gui/focushandler.h"
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
-#include "gui/theme.h"
 #include "gui/truetypefont.h"
 
 #include "gui/widgets/window.h"
 #include "gui/widgets/windowcontainer.h"
 
-#include "configlistener.h"
 #include "configuration.h"
+#include "listener.h"
 #include "graphics.h"
 #include "log.h"
 
@@ -39,6 +38,7 @@
 #include "resources/imageset.h"
 #include "resources/imageloader.h"
 #include "resources/resourcemanager.h"
+#include "resources/theme.h"
 
 #include <guichan/exception.hpp>
 #include <guichan/image.hpp>
@@ -50,19 +50,23 @@ SDLInput *guiInput = 0;
 // Bolded font
 gcn::Font *boldFont = 0;
 
-class GuiConfigListener : public ConfigListener
+class GuiConfigListener : public Mana::Listener
 {
     public:
         GuiConfigListener(Gui *g):
             mGui(g)
         {}
 
-        void optionChanged(const std::string &name)
+        void event(Channels channel, const Mana::Event &event)
         {
-            if (name == "customcursor")
+            if (channel == CHANNEL_CONFIG)
             {
-                bool bCustomCursor = config.getValue("customcursor", 1) == 1;
-                mGui->setUseCustomCursor(bCustomCursor);
+                if (event.getName() == EVENT_CONFIGOPTIONCHANGED &&
+                    event.getString("option") == "customcursor")
+                {
+                    bool bCustomCursor = config.getBoolValue("customcursor");
+                    mGui->setUseCustomCursor(bCustomCursor);
+                }
             }
         }
     private:
@@ -104,7 +108,7 @@ Gui::Gui(Graphics *graphics):
     ResourceManager *resman = ResourceManager::getInstance();
 
     // Set global font
-    const int fontSize = (int) config.getValue("fontSize", 11);
+    const int fontSize = config.getValue("fontSize", 11);
     std::string fontFile = branding.getValue("font", "fonts/dejavusans.ttf");
     std::string path = resman->getPath(fontFile);
 
@@ -135,14 +139,13 @@ Gui::Gui(Graphics *graphics):
     gcn::Widget::setGlobalFont(mGuiFont);
 
     // Initialize mouse cursor and listen for changes to the option
-    setUseCustomCursor(config.getValue("customcursor", 1) == 1);
+    setUseCustomCursor(config.getBoolValue("customcursor"));
     mConfigListener = new GuiConfigListener(this);
-    config.addListener("customcursor", mConfigListener);
+    mConfigListener->listen(CHANNEL_CONFIG);
 }
 
 Gui::~Gui()
 {
-    config.removeListener("customcursor", mConfigListener);
     delete mConfigListener;
 
     if (mMouseCursors)
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index f3c6a0af..aca036c1 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -94,9 +94,9 @@ void HelpWindow::loadHelp(const std::string &helpFile)
 void HelpWindow::loadFile(const std::string &file)
 {
     ResourceManager *resman = ResourceManager::getInstance();
-    std::string helpPath = branding.getValue("helpPath", "");
+    std::string helpPath = branding.getStringValue("helpPath");
     if (helpPath.empty())
-        helpPath = paths.getValue("help", "help/");
+        helpPath = paths.getStringValue("help");
     std::vector<std::string> lines =
         resman->loadTextFile(helpPath + file + ".txt");
 
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 16ac5409..31743c57 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -23,14 +23,13 @@
 
 #include "inventory.h"
 #include "item.h"
-#include "localplayer.h"
 #include "units.h"
 #include "keyboardconfig.h"
+#include "playerinfo.h"
 
 #include "gui/itemamount.h"
 #include "gui/setup.h"
 #include "gui/sdlinput.h"
-#include "gui/theme.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/button.h"
@@ -44,6 +43,7 @@
 #include "net/net.h"
 
 #include "resources/iteminfo.h"
+#include "resources/theme.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -60,6 +60,8 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
     mInventory(inventory),
     mSplit(false)
 {
+    listen(CHANNEL_ATTRIBUTES);
+
     setWindowName(isMainInventory() ? "Inventory" : "Storage");
     setupWindow->registerWindowForReset(this);
     setResizable(true);
@@ -95,7 +97,8 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
             longestUseString = unequip;
         }
 
-        mUseButton = new Button(longestUseString, "use", this);
+        mEquipButton = new Button(_("Equip"), "equip", this);
+        mUseButton = new Button(_("Activate"), "activate", this);
         mDropButton = new Button(_("Drop..."), "drop", this);
         mSplitButton = new Button(_("Split"), "split", this);
         mOutfitButton = new Button(_("Outfits"), "outfit", this);
@@ -109,8 +112,9 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
         place(5, 0, mSlotsBar, 2);
         place(0, 1, invenScroll, 7).setPadding(3);
         place(0, 2, mUseButton);
-        place(1, 2, mDropButton);
-        place(2, 2, mSplitButton);
+        place(1, 2, mEquipButton);
+        place(2, 2, mDropButton);
+        place(3, 2, mSplitButton);
         place(6, 2, mOutfitButton);
 
         updateWeight();
@@ -138,13 +142,19 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
     slotsChanged(mInventory);
 
     if (!isMainInventory())
+    {
         setVisible(true);
+        PlayerInfo::setStorageCount(PlayerInfo::getStorageCount() + 1);
+    }
 }
 
 InventoryWindow::~InventoryWindow()
 {
     instances.remove(this);
     mInventory->removeInventoyListener(this);
+
+    if (!isMainInventory())
+        PlayerInfo::setStorageCount(PlayerInfo::getStorageCount() - 1);
 }
 
 void InventoryWindow::action(const gcn::ActionEvent &event)
@@ -175,17 +185,21 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
     if (!item)
         return;
 
-    if (event.getId() == "use")
+    if (event.getId() == "activate")
+        item->doEvent(EVENT_DOUSE);
+    else if (event.getId() == "equip")
     {
-        if (item->isEquipment())
+        if (item->isEquippable())
         {
             if (item->isEquipped())
-                Net::getInventoryHandler()->unequipItem(item);
+                item->doEvent(EVENT_DOUNEQUIP);
             else
-                Net::getInventoryHandler()->equipItem(item);
+                item->doEvent(EVENT_DOEQUIP);
         }
         else
-            Net::getInventoryHandler()->useItem(item);
+        {
+            item->doEvent(EVENT_DOUSE);
+        }
     }
     else if (event.getId() == "drop")
     {
@@ -234,20 +248,30 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
 
     if (event.getButton() == gcn::MouseEvent::LEFT)
     {
-        if (isStorageActive() && keyboard.isKeyActive(keyboard.KEY_EMOTE))
+        if (instances.size() > 1 && keyboard.isKeyActive(keyboard.KEY_EMOTE))
         {
             Item *item = mItems->getSelectedItem();
 
             if(!item)
                 return;
             if (mInventory->isMainInventory())
-                Net::getInventoryHandler()->moveItem(Inventory::INVENTORY,
-                                            item->getInvIndex(), item->getQuantity(),
-                                            Inventory::STORAGE);
+            {
+                Mana::Event event(EVENT_DOMOVE);
+                event.setItem("item", item);
+                event.setInt("amount", item->getQuantity());
+                event.setInt("source", Inventory::INVENTORY);
+                event.setInt("destination", Inventory::STORAGE);
+                event.trigger(CHANNEL_ITEM);
+            }
             else
-                Net::getInventoryHandler()->moveItem(Inventory::STORAGE,
-                                            item->getInvIndex(), item->getQuantity(),
-                                            Inventory::INVENTORY);
+            {
+                Mana::Event event(EVENT_DOMOVE);
+                event.setItem("item", item);
+                event.setInt("amount", item->getQuantity());
+                event.setInt("source", Inventory::STORAGE);
+                event.setInt("destination", Inventory::INVENTORY);
+                event.trigger(CHANNEL_ITEM);
+            }
         }
     }
 }
@@ -298,26 +322,27 @@ void InventoryWindow::updateButtons()
     if (!item || item->getQuantity() == 0)
     {
         mUseButton->setEnabled(false);
+        mEquipButton->setEnabled(false);
         mDropButton->setEnabled(false);
         mSplitButton->setEnabled(false);
 
         return;
     }
 
-    mUseButton->setEnabled(true);
     mDropButton->setEnabled(true);
 
-    if (item->isEquipment())
+    if (item->getInfo().getEquippable())
     {
         if (item->isEquipped())
-            mUseButton->setCaption(_("Unequip"));
+            mEquipButton->setCaption(_("Unequip"));
         else
-            mUseButton->setCaption(_("Equip"));
+            mEquipButton->setCaption(_("Equip"));
+        mEquipButton->setEnabled(true);
     }
     else
-    {
-        mUseButton->setCaption(_("Use"));
-    }
+        mEquipButton->setEnabled(false);
+
+    mUseButton->setEnabled(item->getInfo().getActivatable());
 
     if (item->getQuantity() > 1)
         mDropButton->setCaption(_("Drop..."));
@@ -343,15 +368,36 @@ void InventoryWindow::close()
     }
     else
     {
-        Net::getInventoryHandler()->closeStorage(Inventory::STORAGE);
+        Mana::Event event(EVENT_DOCLOSEINVENTORY);
+        event.setInt("type", mInventory->getType());
+        event.trigger(CHANNEL_ITEM);
         scheduleDelete();
     }
 }
 
+void InventoryWindow::event(Channels channel, const Mana::Event &event)
+{
+    if (event.getName() == EVENT_UPDATEATTRIBUTE)
+    {
+        int id = event.getInt("id");
+        if (id == TOTAL_WEIGHT ||
+            id == MAX_WEIGHT)
+        {
+            updateWeight();
+        }
+    }
+}
+
 void InventoryWindow::updateWeight()
 {
-    int total = player_node->getTotalWeight();
-    int max = player_node->getMaxWeight();
+    if (!isMainInventory())
+        return;
+
+    int total = PlayerInfo::getAttribute(TOTAL_WEIGHT);
+    int max = PlayerInfo::getAttribute(MAX_WEIGHT);
+
+    if (max <= 0)
+        return;
 
     // Adjust progress bar
     mWeightBar->setProgress((float) total / max);
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 0dce0611..0ddd13f7 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -23,11 +23,11 @@
 #define INVENTORYWINDOW_H
 
 #include "inventory.h"
+#include "listener.h"
 
 #include "gui/widgets/window.h"
 
 #include "net/inventoryhandler.h"
-#include "net/net.h"
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
@@ -47,7 +47,8 @@ class InventoryWindow : public Window,
                         public gcn::ActionListener,
                         public gcn::KeyListener,
                         public gcn::SelectionListener,
-                        public InventoryListener
+                        public InventoryListener,
+                        public Mana::Listener
 {
     public:
         /**
@@ -106,21 +107,19 @@ class InventoryWindow : public Window,
          */
         void updateButtons();
 
-        /**
-         * Updates the weight bar.
-         */
-        void updateWeight();
-
         void slotsChanged(Inventory* inventory);
 
         bool isMainInventory() { return mInventory->isMainInventory(); }
 
+        void event(Channels channel, const Mana::Event &event);
+
+    private:
         /**
-         * Returns true if any instances exist.
+         * Updates the weight bar.
          */
-        static bool isStorageActive() { return instances.size() > 1; }
+        void updateWeight();
+
 
-    private:
         typedef std::list<InventoryWindow*> WindowList;
         static WindowList instances;
 
@@ -129,8 +128,8 @@ class InventoryWindow : public Window,
 
         std::string mWeight, mSlots;
 
-        gcn::Button *mUseButton, *mDropButton, *mSplitButton, *mOutfitButton,
-                    *mStoreButton, *mRetrieveButton;
+        gcn::Button *mUseButton, *mEquipButton, *mDropButton, *mSplitButton,
+                    *mOutfitButton, *mStoreButton, *mRetrieveButton;
 
         gcn::Label *mWeightLabel, *mSlotsLabel;
 
diff --git a/src/gui/itemamount.cpp b/src/gui/itemamount.cpp
index a98a67ab..85325c66 100644
--- a/src/gui/itemamount.cpp
+++ b/src/gui/itemamount.cpp
@@ -47,20 +47,30 @@ void ItemAmountWindow::finish(Item *item, int amount, Usage usage)
             tradeWindow->tradeItem(item, amount);
             break;
         case ItemDrop:
-            Net::getInventoryHandler()->dropItem(item, amount);
+            item->doEvent(EVENT_DODROP, amount);
             break;
         case ItemSplit:
-            Net::getInventoryHandler()->splitItem(item, amount);
+            item->doEvent(EVENT_DOSPLIT, amount);
             break;
         case StoreAdd:
-            Net::getInventoryHandler()->moveItem(Inventory::INVENTORY,
-                                             item->getInvIndex(), amount,
-                                             Inventory::STORAGE);
+        {
+            Mana::Event event(EVENT_DOMOVE);
+            event.setItem("item", item);
+            event.setInt("amount", amount);
+            event.setInt("source", Inventory::INVENTORY);
+            event.setInt("destination", Inventory::STORAGE);
+            event.trigger(CHANNEL_ITEM);
+        }
             break;
         case StoreRemove:
-            Net::getInventoryHandler()->moveItem(Inventory::STORAGE,
-                                             item->getInvIndex(), amount,
-                                             Inventory::INVENTORY);
+        {
+            Mana::Event event(EVENT_DOMOVE);
+            event.setItem("item", item);
+            event.setInt("amount", amount);
+            event.setInt("source", Inventory::STORAGE);
+            event.setInt("destination", Inventory::INVENTORY);
+            event.trigger(CHANNEL_ITEM);
+        }
             break;
         default:
             break;
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index b71ca529..60943756 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -26,27 +26,67 @@
 #include "units.h"
 
 #include "gui/gui.h"
-#include "gui/theme.h"
 
 #include "gui/widgets/icon.h"
+#include "gui/widgets/label.h"
 #include "gui/widgets/textbox.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
+#include "net/net.h"
+
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
+#include "resources/theme.h"
 
 #include <guichan/font.hpp>
 
 #include <guichan/widgets/label.hpp>
 
+#define ITEMPOPUP_WRAP_WIDTH 196
+
+static gcn::Color getColorFromItemType(ItemType type)
+{
+    switch (type)
+    {
+        case ITEM_UNUSABLE:
+            return Theme::getThemeColor(Theme::GENERIC);
+        case ITEM_USABLE:
+            return Theme::getThemeColor(Theme::USABLE);
+        case ITEM_EQUIPMENT_ONE_HAND_WEAPON:
+            return Theme::getThemeColor(Theme::ONEHAND);
+        case ITEM_EQUIPMENT_TWO_HANDS_WEAPON:
+            return Theme::getThemeColor(Theme::TWOHAND);
+        case ITEM_EQUIPMENT_TORSO:
+            return Theme::getThemeColor(Theme::TORSO);
+        case ITEM_EQUIPMENT_ARMS:
+            return Theme::getThemeColor(Theme::ARMS);
+        case ITEM_EQUIPMENT_HEAD:
+            return Theme::getThemeColor(Theme::HEAD);
+        case ITEM_EQUIPMENT_LEGS:
+            return Theme::getThemeColor(Theme::LEGS);
+        case ITEM_EQUIPMENT_SHIELD:
+            return Theme::getThemeColor(Theme::SHIELD);
+        case ITEM_EQUIPMENT_RING:
+            return Theme::getThemeColor(Theme::RING);
+        case ITEM_EQUIPMENT_NECKLACE:
+            return Theme::getThemeColor(Theme::NECKLACE);
+        case ITEM_EQUIPMENT_FEET:
+            return Theme::getThemeColor(Theme::FEET);
+        case ITEM_EQUIPMENT_AMMO:
+            return Theme::getThemeColor(Theme::AMMO);
+        default:
+            return Theme::getThemeColor(Theme::UNKNOWN_ITEM);
+    }
+}
+
 ItemPopup::ItemPopup():
     Popup("ItemPopup"),
     mIcon(0)
 {
     // Item Name
-    mItemName = new gcn::Label;
+    mItemName = new Label;
     mItemName->setFont(boldFont);
     mItemName->setPosition(getPadding(), getPadding());
 
@@ -98,8 +138,9 @@ void ItemPopup::setItem(const ItemInfo &item, bool showImage)
     {
         ResourceManager *resman = ResourceManager::getInstance();
         Image *image = resman->getImage(
-                           paths.getValue("itemIcons", "graphics/items/")
-                                        + item.getImageName());
+                                  paths.getStringValue("itemIcons")
+                                  + item.getDisplay().image);
+
         mIcon->setImage(image);
         if (image)
         {
@@ -114,18 +155,25 @@ void ItemPopup::setItem(const ItemInfo &item, bool showImage)
         mIcon->setImage(0);
     }
 
-    mItemType = item.getType();
+    mItemType = item.getItemType();
 
     mItemName->setCaption(item.getName());
     mItemName->adjustSize();
-    mItemName->setForegroundColor(getColor(mItemType));
+    mItemName->setForegroundColor(getColorFromItemType(mItemType));
     mItemName->setPosition(getPadding() + space, getPadding());
 
-    mItemDesc->setTextWrapped(item.getDescription(), 196);
-    mItemEffect->setTextWrapped(item.getEffect(), 196);
+    mItemDesc->setTextWrapped(item.getDescription(), ITEMPOPUP_WRAP_WIDTH);
+    {
+        const std::vector<std::string> &effect = item.getEffect();
+        std::string temp = "";
+        for (std::vector<std::string>::const_iterator it = effect.begin(),
+             it_end = effect.end(); it != it_end; ++it)
+            temp += temp.empty() ? *it : "\n" + *it;
+        mItemEffect->setTextWrapped(temp, ITEMPOPUP_WRAP_WIDTH);
+    }
     mItemWeight->setTextWrapped(strprintf(_("Weight: %s"),
                                 Units::formatWeight(item.getWeight()).c_str()),
-                                196);
+                                ITEMPOPUP_WRAP_WIDTH);
 
     int minWidth = mItemName->getWidth() + space;
 
@@ -172,41 +220,6 @@ void ItemPopup::setItem(const ItemInfo &item, bool showImage)
                             (numRowsDesc + 1) * fontHeight);
 }
 
-gcn::Color ItemPopup::getColor(ItemType type)
-{
-    switch (type)
-    {
-        case ITEM_UNUSABLE:
-            return Theme::getThemeColor(Theme::GENERIC);
-        case ITEM_USABLE:
-            return Theme::getThemeColor(Theme::USABLE);
-        case ITEM_EQUIPMENT_ONE_HAND_WEAPON:
-            return Theme::getThemeColor(Theme::ONEHAND);
-        case ITEM_EQUIPMENT_TWO_HANDS_WEAPON:
-            return Theme::getThemeColor(Theme::TWOHAND);
-        case ITEM_EQUIPMENT_TORSO:
-            return Theme::getThemeColor(Theme::TORSO);
-        case ITEM_EQUIPMENT_ARMS:
-            return Theme::getThemeColor(Theme::ARMS);
-        case ITEM_EQUIPMENT_HEAD:
-            return Theme::getThemeColor(Theme::HEAD);
-        case ITEM_EQUIPMENT_LEGS:
-            return Theme::getThemeColor(Theme::LEGS);
-        case ITEM_EQUIPMENT_SHIELD:
-            return Theme::getThemeColor(Theme::SHIELD);
-        case ITEM_EQUIPMENT_RING:
-            return Theme::getThemeColor(Theme::RING);
-        case ITEM_EQUIPMENT_NECKLACE:
-            return Theme::getThemeColor(Theme::NECKLACE);
-        case ITEM_EQUIPMENT_FEET:
-            return Theme::getThemeColor(Theme::FEET);
-        case ITEM_EQUIPMENT_AMMO:
-            return Theme::getThemeColor(Theme::AMMO);
-        default:
-            return Theme::getThemeColor(Theme::UNKNOWN_ITEM);
-    }
-}
-
 void ItemPopup::mouseMoved(gcn::MouseEvent &event)
 {
     Popup::mouseMoved(event);
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index a3976a11..f054ddf5 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -62,8 +62,6 @@ class ItemPopup : public Popup
         TextBox *mItemWeight;
         ItemType mItemType;
         Icon *mIcon;
-
-        static gcn::Color getColor(ItemType type);
 };
 
 #endif // ITEMPOPUP_H
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 8713d3f9..993814ea 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -21,20 +21,19 @@
 
 #include "gui/minimap.h"
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
 #include "configuration.h"
 #include "graphics.h"
 #include "localplayer.h"
 #include "log.h"
 #include "map.h"
-#include "player.h"
 
 #include "gui/setup.h"
-#include "gui/userpalette.h"
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
+#include "resources/userpalette.h"
 
 #include "utils/gettext.h"
 
@@ -186,52 +185,46 @@ void Minimap::draw(gcn::Graphics *graphics)
             drawImage(mMapImage, mapOriginX, mapOriginY);
     }
 
-    const Beings &beings = beingManager->getAll();
+    const ActorSprites &actors = actorSpriteManager->getAll();
 
-    for (Beings::const_iterator bi = beings.begin(), bi_end = beings.end();
-         bi != bi_end; ++bi)
+    for (ActorSpritesConstIterator it = actors.begin(), it_end = actors.end();
+         it != it_end; it++)
     {
-        const Being *being = (*bi);
+        if ((*it)->getType() == ActorSprite::FLOOR_ITEM)
+            continue;
+
+        const Being *being = static_cast<Being*>(*it);
         int dotSize = 2;
 
-        switch (being->getType())
+        int type = UserPalette::PC;
+
+        if (being == player_node)
+        {
+            type = UserPalette::SELF;
+            dotSize = 3;
+        }
+        else if (being->isGM())
+            type = UserPalette::GM;
+        else if (being->isInParty())
+            type = UserPalette::PARTY;
+        else
         {
-            case Being::PLAYER:
-                {
-                    const Player *player = static_cast<const Player*>(being);
-
-                    int type = UserPalette::PC;
-
-                    if (being == player_node)
-                    {
-                        type = UserPalette::SELF;
-                        dotSize = 3;
-                    }
-                    else if (player->isGM())
-                    {
-                        type = UserPalette::GM;
-                    }
-                    else if (player->isInParty())
-                    {
-                        type = UserPalette::PARTY;
-                    }
-
-                    graphics->setColor(userPalette->getColor(type));
+            switch (being->getType())
+            {
+                case ActorSprite::MONSTER:
+                    graphics->setColor(userPalette->getColor(UserPalette::MONSTER));
                     break;
-                 }
-
-            case Being::MONSTER:
-                graphics->setColor(userPalette->getColor(UserPalette::MONSTER));
-                break;
 
-            case Being::NPC:
-                graphics->setColor(userPalette->getColor(UserPalette::NPC));
-                break;
+                case ActorSprite::NPC:
+                    graphics->setColor(userPalette->getColor(UserPalette::NPC));
+                    break;
 
-            default:
-                continue;
+                default:
+                    continue;
+            }
         }
 
+        graphics->setColor(userPalette->getColor(type));
 
         const int offsetHeight = (int) ((dotSize - 1) * mHeightProportion);
         const int offsetWidth = (int) ((dotSize - 1) * mWidthProportion);
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 90581f61..fae40d03 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -24,17 +24,20 @@
 #include "animatedsprite.h"
 #include "configuration.h"
 #include "graphics.h"
-#include "localplayer.h"
+#include "playerinfo.h"
+#include "statuseffect.h"
 
 #include "gui/gui.h"
 #include "gui/statuswindow.h"
 #include "gui/textpopup.h"
-#include "gui/theme.h"
 
 #include "gui/widgets/progressbar.h"
 
 #include "net/net.h"
 #include "net/playerhandler.h"
+#include "net/gamehandler.h"
+
+#include "resources/theme.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -44,22 +47,36 @@ extern volatile int tick_time;
 MiniStatusWindow::MiniStatusWindow():
     Popup("MiniStatus")
 {
-    int max = player_node->getMaxHp();
-    mHpBar = new ProgressBar(max ? (float) player_node->getHp() / max : 0,
-                             100, 20, Theme::PROG_HP);
-    max = player_node->getMaxMP();
-    mMpBar = new ProgressBar(max ? (float) player_node->getMP() / max : 0,
-                             100, 20, Net::getPlayerHandler()->canUseMagic() ?
-                             Theme::PROG_MP : Theme::PROG_NO_MP);
-    max = player_node->getExpNeeded();
-    mXpBar = new ProgressBar(max ? (float) player_node->getExp() / max : 0,
-                             100, 20, Theme::PROG_EXP);
+    listen(CHANNEL_ATTRIBUTES);
+
+    mHpBar = new ProgressBar(0, 100, 20, Theme::PROG_HP);
+    StatusWindow::updateHPBar(mHpBar);
+
+    if (Net::getGameHandler()->canUseMagicBar())
+    {
+        mMpBar = new ProgressBar(0, 100, 20,
+                        Net::getPlayerHandler()->canUseMagic()
+                        ? Theme::PROG_MP : Theme::PROG_NO_MP);
+
+        StatusWindow::updateMPBar(mMpBar);
+    }
+    else
+        mMpBar = 0;
+
+    mXpBar = new ProgressBar(0, 100, 20, Theme::PROG_EXP);
+    StatusWindow::updateXPBar(mXpBar);
+
+    // Add the progressbars to the window
+
     mHpBar->setPosition(0, 3);
-    mMpBar->setPosition(mHpBar->getWidth() + 3, 3);
-    mXpBar->setPosition(mMpBar->getX() + mMpBar->getWidth() + 3, 3);
+    if (mMpBar)
+        mMpBar->setPosition(mHpBar->getWidth() + 3, 3);
+    mXpBar->setPosition(mMpBar ? mMpBar->getX() + mMpBar->getWidth() + 3 :
+                                 mHpBar->getX() + mHpBar->getWidth() + 3, 3);
 
     add(mHpBar);
-    add(mMpBar);
+    if (mMpBar)
+        add(mMpBar);
     add(mXpBar);
 
     setContentSize(mXpBar->getX() + mXpBar->getWidth(),
@@ -70,8 +87,6 @@ MiniStatusWindow::MiniStatusWindow():
     mTextPopup = new TextPopup();
 
     addMouseListener(this);
-
-    update(StatusWindow::HP);
 }
 
 void MiniStatusWindow::setIcon(int index, AnimatedSprite *sprite)
@@ -104,19 +119,82 @@ void MiniStatusWindow::drawIcons(Graphics *graphics)
     }
 }
 
-void MiniStatusWindow::update(int id)
+void MiniStatusWindow::event(Channels channel, const Mana::Event &event)
 {
-    if (id == StatusWindow::HP)
-    {
-        StatusWindow::updateHPBar(mHpBar);
-    }
-    else if (id == StatusWindow::MP)
+    if (channel == CHANNEL_ATTRIBUTES)
     {
-        StatusWindow::updateMPBar(mMpBar);
+        if (event.getName() == EVENT_UPDATEATTRIBUTE)
+        {
+            int id = event.getInt("id");
+            if (id == HP || id == MAX_HP)
+            {
+                StatusWindow::updateHPBar(mHpBar);
+            }
+            else if (id == MP || id == MAX_MP)
+            {
+                StatusWindow::updateMPBar(mMpBar);
+            }
+            else if (id == EXP || id == EXP_NEEDED)
+            {
+                StatusWindow::updateXPBar(mXpBar);
+            }
+        }
     }
-    else if (id == StatusWindow::EXP)
+    else if (channel == CHANNEL_ACTORSPRITE)
     {
-        StatusWindow::updateXPBar(mXpBar);
+        if (event.getName() == EVENT_UPDATESTATUSEFFECT)
+        {
+            int index = event.getInt("index");
+            bool newStatus = event.getBool("newStatus");
+
+            StatusEffect *effect = StatusEffect::getStatusEffect(index,
+                                                                 newStatus);
+
+            if (effect)
+            {
+                effect->deliverMessage();
+                effect->playSFX();
+
+                AnimatedSprite *sprite = effect->getIcon();
+
+                typedef std::vector<int> IntMap;
+
+                if (!sprite)
+                {
+                    // delete sprite, if necessary
+                    for (unsigned int i = 0; i < mStatusEffectIcons.size();)
+                        if (mStatusEffectIcons[i] == index)
+                        {
+                            mStatusEffectIcons.erase(mStatusEffectIcons.begin()
+                                                     + i);
+                            miniStatusWindow->eraseIcon(i);
+                        }
+                        else
+                            i++;
+                }
+                else
+                {
+                    // replace sprite or append
+                    bool found = false;
+
+                    for (unsigned int i = 0; i < mStatusEffectIcons.size();
+                         i++)
+                        if (mStatusEffectIcons[i] == index)
+                        {
+                            miniStatusWindow->setIcon(i, sprite);
+                            found = true;
+                            break;
+                        }
+
+                    if (!found)
+                    { // add new
+                        int offset = mStatusEffectIcons.size();
+                        miniStatusWindow->setIcon(offset, sprite);
+                        mStatusEffectIcons.push_back(index);
+                    }
+                }
+            }
+        }
     }
 }
 
@@ -152,23 +230,23 @@ void MiniStatusWindow::mouseMoved(gcn::MouseEvent &event)
     if (event.getSource() == mXpBar)
     {
         mTextPopup->show(x + getX(), y + getY(),
-                         strprintf("%u/%u", player_node->getExp(),
-                                   player_node->getExpNeeded()),
+                         strprintf("%u/%u", PlayerInfo::getAttribute(EXP),
+                                   PlayerInfo::getAttribute(EXP_NEEDED)),
                          strprintf("%s: %u", _("Need"),
-                                   player_node->getExpNeeded()
-                                   - player_node->getExp()));
+                                   PlayerInfo::getAttribute(EXP_NEEDED)
+                                   - PlayerInfo::getAttribute(EXP)));
     }
     else if (event.getSource() == mHpBar)
     {
         mTextPopup->show(x + getX(), y + getY(),
-                         strprintf("%u/%u", player_node->getHp(),
-                                   player_node->getMaxHp()));
+                         strprintf("%u/%u", PlayerInfo::getAttribute(HP),
+                                   PlayerInfo::getAttribute(MAX_HP)));
     }
     else if (event.getSource() == mMpBar)
     {
         mTextPopup->show(x + getX(), y + getY(),
-                         strprintf("%u/%u", player_node->getMP(),
-                                   player_node->getMaxMP()));
+                         strprintf("%u/%u", PlayerInfo::getAttribute(MP),
+                                   PlayerInfo::getAttribute(MAX_MP)));
     }
     else
     {
@@ -182,5 +260,3 @@ void MiniStatusWindow::mouseExited(gcn::MouseEvent &event)
 
     mTextPopup->setVisible(false);
 }
-
-
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index bb8d4094..9dfcaeae 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -22,6 +22,8 @@
 #ifndef MINISTATUS_H
 #define MINISTATUS_H
 
+#include "listener.h"
+
 #include "gui/widgets/popup.h"
 
 #include <vector>
@@ -36,21 +38,14 @@ class TextPopup;
  *
  * \ingroup Interface
  */
-class MiniStatusWindow : public Popup
+class MiniStatusWindow : public Popup, public Mana::Listener
 {
     public:
         MiniStatusWindow();
 
-        /**
-         * Sets one of the icons.
-         */
-        void setIcon(int index, AnimatedSprite *sprite);
-
-        void eraseIcon(int index);
-
         void drawIcons(Graphics *graphics);
 
-        void update(int id); // Same types as status window
+        void event(Channels channel, const Mana::Event &event);
 
         void logic(); // Updates icons
 
@@ -63,6 +58,13 @@ class MiniStatusWindow : public Popup
     private:
         bool isInBar(ProgressBar *bar, int x, int y) const;
 
+        /**
+         * Sets one of the icons.
+         */
+        void setIcon(int index, AnimatedSprite *sprite);
+
+        void eraseIcon(int index);
+
         /*
          * Mini Status Bars
          */
@@ -71,6 +73,7 @@ class MiniStatusWindow : public Popup
         ProgressBar *mXpBar;
         TextPopup *mTextPopup;
 
+        std::vector<int> mStatusEffectIcons;
         std::vector<AnimatedSprite *> mIcons;
 };
 
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index c4128588..590001b0 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -22,8 +22,11 @@
 #include "gui/npcdialog.h"
 
 #include "configuration.h"
-#include "npc.h"
+#include "event.h"
+#include "listener.h"
+#include "playerinfo.h"
 
+#include "gui/npcpostdialog.h"
 #include "gui/setup.h"
 
 #include "gui/widgets/button.h"
@@ -47,12 +50,29 @@
 #define CAPTION_CLOSE _("Close")
 #define CAPTION_SUBMIT _("Submit")
 
+typedef std::map<int, NpcDialog*> NpcDialogs;
+
+class NpcEventListener : public Mana::Listener
+{
+public:
+    void event(Channels channel, const Mana::Event &event);
+
+    NpcDialog *getDialog(int id, bool make = true);
+
+    void removeDialog(int id);
+
+private:
+    NpcDialogs mNpcDialogs;
+};
+
+static NpcEventListener *npcListener = NULL;
+
 NpcDialog::DialogList NpcDialog::instances;
 
 NpcDialog::NpcDialog(int npcId)
     : Window(_("NPC")),
       mNpcId(npcId),
-      mLogInteraction(config.getValue("logNpcInGui", true)),
+      mLogInteraction(config.getBoolValue("logNpcInGui")),
       mDefaultInt(0),
       mInputState(NPC_INPUT_NONE),
       mActionState(NPC_ACTION_WAIT)
@@ -123,7 +143,9 @@ NpcDialog::NpcDialog(int npcId)
     setVisible(true);
     requestFocus();
 
-    config.addListener("logNpcInGui", this);
+    listen(CHANNEL_CONFIG);
+    PlayerInfo::setNPCInteractionCount(PlayerInfo::getNPCInteractionCount()
+                                       + 1);
 }
 
 NpcDialog::~NpcDialog()
@@ -139,7 +161,10 @@ NpcDialog::~NpcDialog()
 
     instances.remove(this);
 
-    config.removeListener("logNpcInGui", this);
+    PlayerInfo::setNPCInteractionCount(PlayerInfo::getNPCInteractionCount()
+                                       - 1);
+
+    npcListener->removeDialog(mNpcId);
 }
 
 void NpcDialog::setText(const std::string &text)
@@ -192,26 +217,25 @@ void NpcDialog::action(const gcn::ActionEvent &event)
 
             if (mInputState == NPC_INPUT_LIST)
             {
-                int choice = 0;
                 int selectedIndex = mItemList->getSelected();
 
                 if (selectedIndex >= (int) mItems.size() || selectedIndex < 0)
-                {
                     return;
-                }
-                choice = selectedIndex + 1;
+
                 printText = mItems[selectedIndex];
 
-                Net::getNpcHandler()->listInput(mNpcId, choice);
+                Net::getNpcHandler()->menuSelect(mNpcId, selectedIndex + 1);
             }
             else if (mInputState == NPC_INPUT_STRING)
             {
                 printText = mTextField->getText();
+
                 Net::getNpcHandler()->stringInput(mNpcId, printText);
             }
             else if (mInputState == NPC_INPUT_INTEGER)
             {
                 printText = strprintf("%d", mIntField->getValue());
+
                 Net::getNpcHandler()->integerInput(mNpcId, mIntField->getValue());
             }
             // addText will auto remove the input layout
@@ -256,6 +280,7 @@ void NpcDialog::nextDialog()
 void NpcDialog::closeDialog()
 {
     Net::getNpcHandler()->closeDialog(mNpcId);
+    close();
 }
 
 int NpcDialog::getNumberOfElements()
@@ -281,15 +306,6 @@ void NpcDialog::addChoice(const std::string &choice)
     mItems.push_back(choice);
 }
 
-void NpcDialog::parseListItems(const std::string &itemString)
-{
-    std::istringstream iss(itemString);
-
-    std::string tmp;
-    while (getline(iss, tmp, ':'))
-        mItems.push_back(tmp);
-}
-
 void NpcDialog::textRequest(const std::string &defaultText)
 {
     mActionState = NPC_ACTION_INPUT;
@@ -371,11 +387,15 @@ void NpcDialog::setVisible(bool visible)
     }
 }
 
-void NpcDialog::optionChanged(const std::string &name)
+void NpcDialog::event(Channels channel, const Mana::Event &event)
 {
-    if (name == "logNpcInGui")
+    if (channel != CHANNEL_CONFIG)
+        return;
+
+    if (event.getName() == EVENT_CONFIGOPTIONCHANGED &&
+        event.getString("option") == "logNpcInGui")
     {
-        mLogInteraction = config.getValue("logNpcInGui", true);
+        mLogInteraction = config.getBoolValue("logNpcInGui");
     }
 }
 
@@ -409,6 +429,16 @@ void NpcDialog::closeAll()
     }
 }
 
+void NpcDialog::setup()
+{
+    if (npcListener)
+        return;
+
+    npcListener = new NpcEventListener();
+
+    npcListener->listen(CHANNEL_NPC);
+}
+
 void NpcDialog::buildLayout()
 {
     clearLayout();
@@ -475,3 +505,123 @@ void NpcDialog::buildLayout()
 
     mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
 }
+
+void NpcEventListener::event(Channels channel,
+                             const Mana::Event &event)
+{
+    if (channel != CHANNEL_NPC)
+        return;
+
+    if (event.getName() == EVENT_MESSAGE)
+    {
+        NpcDialog *dialog = getDialog(event.getInt("id"));
+
+        dialog->addText(event.getString("text"));
+    }
+    else if (event.getName() == EVENT_MENU)
+    {
+        NpcDialog *dialog = getDialog(event.getInt("id"));
+
+        dialog->choiceRequest();
+
+        int count = event.getInt("choiceCount");
+        for (int i = 1; i <= count; i++)
+            dialog->addChoice(event.getString("choice" + toString(i)));
+    }
+    else if (event.getName() == EVENT_INTEGERINPUT)
+    {
+        NpcDialog *dialog = getDialog(event.getInt("id"));
+
+        int defaultValue = event.getInt("default", 0);
+        int min = event.getInt("min", 0);
+        int max = event.getInt("max", 2147483647);
+
+        dialog->integerRequest(defaultValue, min, max);
+    }
+    else if (event.getName() == EVENT_STRINGINPUT)
+    {
+        NpcDialog *dialog = getDialog(event.getInt("id"));
+
+        try
+        {
+            dialog->textRequest(event.getString("default"));
+        }
+        catch (Mana::BadEvent)
+        {
+            dialog->textRequest("");
+        }
+    }
+    else if (event.getName() == EVENT_NEXT)
+    {
+        int id = event.getInt("id");
+        NpcDialog *dialog = getDialog(id, false);
+
+        if (!dialog)
+        {
+            int mNpcId = id;
+            Net::getNpcHandler()->nextDialog(mNpcId);
+            return;
+        }
+
+        dialog->showNextButton();
+    }
+    else if (event.getName() == EVENT_CLOSE)
+    {
+        int id = event.getInt("id");
+        NpcDialog *dialog = getDialog(id, false);
+
+        if (!dialog)
+        {
+            int mNpcId = id;
+            Net::getNpcHandler()->closeDialog(mNpcId);
+            return;
+        }
+
+        dialog->showCloseButton();
+    }
+    else if (event.getName() == EVENT_CLOSEALL)
+    {
+        NpcDialog::closeAll();
+    }
+    else if (event.getName() == EVENT_END)
+    {
+        int id = event.getInt("id");
+        NpcDialog *dialog = getDialog(id, false);
+
+        if (dialog)
+            dialog->close();
+    }
+    else if (event.getName() == EVENT_POST)
+    {
+        new NpcPostDialog(event.getInt("id"));
+    }
+}
+
+NpcDialog *NpcEventListener::getDialog(int id, bool make)
+{
+    NpcDialogs::iterator diag = mNpcDialogs.find(id);
+    NpcDialog *dialog = 0;
+
+    if (diag == mNpcDialogs.end())
+    {
+        // Empty dialogs don't help
+        if (make)
+        {
+            dialog = new NpcDialog(id);
+            mNpcDialogs[id] = dialog;
+        }
+    }
+    else
+    {
+        dialog = diag->second;
+    }
+
+    return dialog;
+}
+
+void NpcEventListener::removeDialog(int id)
+{
+    NpcDialogs::iterator it = mNpcDialogs.find(id);
+    if (it != mNpcDialogs.end())
+        mNpcDialogs.erase(it);
+}
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h
index 337da6f2..d0131d0e 100644
--- a/src/gui/npcdialog.h
+++ b/src/gui/npcdialog.h
@@ -22,8 +22,7 @@
 #ifndef NPCDIALOG_H
 #define NPCDIALOG_H
 
-#include "configlistener.h"
-#include "npc.h"
+#include "listener.h"
 
 #include "gui/widgets/window.h"
 
@@ -46,7 +45,7 @@ class Button;
  * \ingroup Interface
  */
 class NpcDialog : public Window, public gcn::ActionListener,
-                  public gcn::ListModel, public ConfigListener
+                  public gcn::ListModel, public Mana::Listener
 {
     public:
         /**
@@ -120,13 +119,6 @@ class NpcDialog : public Window, public gcn::ActionListener,
         void addChoice(const std::string &);
 
         /**
-          * Fills the options list for an NPC dialog.
-          *
-          * @param itemString A string with the options separated with colons.
-          */
-        void parseListItems(const std::string &itemString);
-
-        /**
          * Requests a text string from the user.
          */
         void textRequest(const std::string &defaultText = "");
@@ -140,8 +132,7 @@ class NpcDialog : public Window, public gcn::ActionListener,
         /**
          * Requests a interger from the user.
          */
-        void integerRequest(int defaultValue = 0, int min = 0,
-                            int max = 2147483647);
+        void integerRequest(int defaultValue, int min, int max);
 
         void move(int amount);
 
@@ -154,12 +145,7 @@ class NpcDialog : public Window, public gcn::ActionListener,
 
         void setVisible(bool visible);
 
-        void optionChanged(const std::string &name);
-
-        /**
-         * Returns true if any instances exist.
-         */
-        static bool isActive() { return instances.size() > 0; }
+        void event(Channels channel, const Mana::Event &event);
 
         /**
          * Returns the first active instance. Useful for pushing user
@@ -172,6 +158,8 @@ class NpcDialog : public Window, public gcn::ActionListener,
          */
         static void closeAll();
 
+        static void setup();
+
     private:
         typedef std::list<NpcDialog*> DialogList;
         static DialogList instances;
diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp
index 19d0cf61..c53203be 100644
--- a/src/gui/npcpostdialog.cpp
+++ b/src/gui/npcpostdialog.cpp
@@ -21,10 +21,10 @@
 
 #include "gui/npcpostdialog.h"
 
-#include "npc.h"
+#include "event.h"
+#include "playerinfo.h"
 
 #include "gui/widgets/button.h"
-#include "gui/widgets/chattab.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/textbox.h"
 #include "gui/widgets/textfield.h"
@@ -80,11 +80,14 @@ NpcPostDialog::NpcPostDialog(int npcId):
 
     instances.push_back(this);
     setVisible(true);
+
+    PlayerInfo::setNPCPostCount(PlayerInfo::getNPCPostCount() + 1);
 }
 
 NpcPostDialog::~NpcPostDialog()
 {
     instances.remove(this);
+    PlayerInfo::setNPCPostCount(PlayerInfo::getNPCPostCount() - 1);
 }
 
 void NpcPostDialog::action(const gcn::ActionEvent &event)
@@ -93,12 +96,12 @@ void NpcPostDialog::action(const gcn::ActionEvent &event)
     {
         if (mSender->getText().empty() || mText->getText().empty())
         {
-            localChatTab->chatLog(_("Failed to send as sender or letter "
-                    "invalid."));
+            SERVER_NOTICE(_("Failed to send as sender or letter invalid."))
         }
         else
         {
-            Net::getNpcHandler()->sendLetter(mNpcId, mSender->getText(),
+            Net::getNpcHandler()->sendLetter(mNpcId,
+                                             mSender->getText(),
                                              mText->getText());
         }
         setVisible(false);
diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h
index ad0053a3..248e4515 100644
--- a/src/gui/npcpostdialog.h
+++ b/src/gui/npcpostdialog.h
@@ -47,11 +47,6 @@ public:
     void setVisible(bool visible);
 
     /**
-     * Returns true if any instances exist.
-     */
-    static bool isActive() { return instances.size() > 0; }
-
-    /**
      * Closes all instances.
      */
     static void closeAll();
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 89bf47da..8da8914a 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -22,18 +22,17 @@
 #include "outfitwindow.h"
 
 #include "configuration.h"
-#include "localplayer.h"
+#include "equipment.h"
 #include "graphics.h"
 #include "inventory.h"
-#include "equipment.h"
 #include "item.h"
 #include "log.h"
+#include "playerinfo.h"
 
 #include "gui/chat.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
-#include "gui/widgets/chattab.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 
@@ -41,6 +40,7 @@
 #include "net/net.h"
 
 #include "resources/image.h"
+#include "resources/iteminfo.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -168,11 +168,11 @@ void OutfitWindow::wearOutfit(int outfit)
     Item *item;
     for (int i = 0; i < OUTFIT_ITEM_COUNT; i++)
     {
-        item = player_node->getInventory()->findItem(mItems[outfit][i]);
+        item = PlayerInfo::getInventory()->findItem(mItems[outfit][i]);
         if (item && !item->isEquipped() && item->getQuantity())
         {
-            if (item->isEquipment())
-                Net::getInventoryHandler()->equipItem(item);
+            if (item->isEquippable())
+                item->doEvent(EVENT_DOEQUIP);
         }
     }
 }
@@ -206,7 +206,7 @@ void OutfitWindow::draw(gcn::Graphics *graphics)
         }
 
         Item *item =
-            player_node->getInventory()->findItem(mItems[mCurrentOutfit][i]);
+               PlayerInfo::getInventory()->findItem(mItems[mCurrentOutfit][i]);
         if (item)
          {
             // Draw item icon.
@@ -245,7 +245,7 @@ void OutfitWindow::mouseDragged(gcn::MouseEvent &event)
             const int itemId = mItems[mCurrentOutfit][index];
             if (itemId < 0)
                 return;
-            Item *item = player_node->getInventory()->findItem(itemId);
+            Item *item = PlayerInfo::getInventory()->findItem(itemId);
             if (item)
             {
                 mItemMoved = item;
@@ -319,7 +319,7 @@ int OutfitWindow::getIndexFromGrid(int pointX, int pointY) const
 
 void OutfitWindow::unequipNotInOutfit(int outfit)
 {
-    Inventory *inventory = player_node->getInventory();
+    Inventory *inventory = PlayerInfo::getInventory();
     if (!inventory)
         return;
 
@@ -338,7 +338,10 @@ void OutfitWindow::unequipNotInOutfit(int outfit)
             }
             if (!found)
             {
-                Net::getInventoryHandler()->unequipItem(inventory->getItem(i));
+                Item *item = inventory->getItem(i);
+
+                if (item)
+                    item->doEvent(EVENT_DOUNEQUIP);
             }
         }
     }
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index fa068cda..f5259c35 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -21,14 +21,14 @@
 
 #include "gui/popupmenu.h"
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
 #include "flooritem.h"
 #include "graphics.h"
 #include "item.h"
 #include "localplayer.h"
 #include "log.h"
-#include "npc.h"
+#include "playerinfo.h"
 #include "playerrelations.h"
 
 #include "gui/chat.h"
@@ -76,7 +76,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 
     switch (being->getType())
     {
-        case Being::PLAYER:
+        case ActorSprite::PLAYER:
             {
                 // Players can be traded with.
                 mBrowserBox->addRow(strprintf("@@trade|%s@@",
@@ -143,7 +143,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
             }
             break;
 
-        case Being::NPC:
+        case ActorSprite::NPC:
             // NPCs can be talked to (single option, candidate for removal
             // unless more options would be added)
             mBrowserBox->addRow(strprintf("@@talk|%s@@",
@@ -151,7 +151,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
                                                     name.c_str()).c_str()));
             break;
 
-        case Being::MONSTER:
+        case ActorSprite::MONSTER:
             {
                 // Monsters can be attacked
                 mBrowserBox->addRow(strprintf("@@attack|%s@@",
@@ -180,11 +180,11 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 void PopupMenu::showPopup(int x, int y, FloorItem *floorItem)
 {
     mFloorItem = floorItem;
-    mItem = floorItem->getItem();
+    ItemInfo info = floorItem->getInfo();
     mBrowserBox->clearRows();
 
     // Floor item can be picked up (single option, candidate for removal)
-    std::string name = ItemDB::get(mFloorItem->getItemId()).getName();
+    std::string name = info.getName();
     mBrowserBox->addRow(strprintf("@@pickup|%s@@", strprintf(_("Pick up %s"),
                                                     name.c_str()).c_str()));
     mBrowserBox->addRow(strprintf("@@chat|%s@@", _("Add to chat")));
@@ -198,16 +198,17 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem)
 
 void PopupMenu::handleLink(const std::string &link)
 {
-    Being *being = beingManager->findBeing(mBeingId);
+    Being *being = actorSpriteManager->findBeing(mBeingId);
 
     // Talk To action
-    if (link == "talk" && being && being->getType() == Being::NPC)
+    if (link == "talk" && being && being->canTalk())
     {
-        static_cast<NPC*>(being)->talk();
+        being->talkTo();
     }
 
     // Trade action
-    else if (link == "trade" && being && being->getType() == Being::PLAYER)
+    else if (link == "trade" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
         Net::getTradeHandler()->request(being);
         tradePartnerName = being->getName();
@@ -221,27 +222,32 @@ void PopupMenu::handleLink(const std::string &link)
     {
         chatWindow->addInputText("/w \"" + being->getName() + "\" ");
     }
-    else if (link == "unignore" && being && being->getType() == Being::PLAYER)
+    else if (link == "unignore" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::NEUTRAL);
     }
 
-    else if (link == "ignore" && being && being->getType() == Being::PLAYER)
+    else if (link == "ignore" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::IGNORED);
     }
 
-    else if (link == "disregard" && being && being->getType() == Being::PLAYER)
+    else if (link == "disregard" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::DISREGARDED);
     }
 
-    else if (link == "friend" && being && being->getType() == Being::PLAYER)
+    else if (link == "friend" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::FRIEND);
     }
     // Guild action
-    else if (link == "guild" && being && being->getType() == Being::PLAYER)
+    else if (link == "guild" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
         player_node->inviteToGuild(being);
     }
@@ -257,25 +263,27 @@ void PopupMenu::handleLink(const std::string &link)
     {
     }
 
-    else if (link == "use")
+    else if (link == "activate")
     {
         assert(mItem);
-        if (mItem->isEquipment())
+        if (mItem->isEquippable())
         {
             if (mItem->isEquipped())
-                Net::getInventoryHandler()->unequipItem(mItem);
+                mItem->doEvent(EVENT_DOUNEQUIP);
             else
-                Net::getInventoryHandler()->equipItem(mItem);
+                mItem->doEvent(EVENT_DOEQUIP);
         }
         else
         {
-            Net::getInventoryHandler()->useItem(mItem);
+            mItem->doEvent(EVENT_DOUSE);
         }
     }
-
     else if (link == "chat")
     {
-        chatWindow->addItemText(mItem->getInfo().getName());
+        if (mItem)
+            chatWindow->addItemText(mItem->getInfo().getName());
+        else if (mFloorItem)
+            chatWindow->addItemText(mFloorItem->getInfo().getName());
     }
 
     else if (link == "split")
@@ -302,9 +310,10 @@ void PopupMenu::handleLink(const std::string &link)
                                      mItem);
     }
 
-    else if (link == "party" && being && being->getType() == Being::PLAYER)
+    else if (link == "party" && being &&
+             being->getType() == ActorSprite::PLAYER)
     {
-        Net::getPartyHandler()->invite(static_cast<Player*>(being));
+        Net::getPartyHandler()->invite(being);
     }
 
     else if (link == "name" && being)
@@ -315,8 +324,8 @@ void PopupMenu::handleLink(const std::string &link)
 
     else if (link == "admin-kick" &&
              being &&
-             (being->getType() == Being::PLAYER ||
-              being->getType() == Being::MONSTER))
+             (being->getType() == ActorSprite::PLAYER ||
+              being->getType() == ActorSprite::MONSTER))
     {
         Net::getAdminHandler()->kick(being->getId());
     }
@@ -344,20 +353,20 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item,
 
     if (isInventory)
     {
-        if (InventoryWindow::isStorageActive())
+        if (PlayerInfo::getStorageCount() > 0)
         {
             mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store")));
         }
 
-        if (item->isEquipment())
+        if (item->getInfo().getEquippable())
         {
             if (item->isEquipped())
-                mBrowserBox->addRow(strprintf("@@use|%s@@", _("Unequip")));
+                mBrowserBox->addRow(strprintf("@@equip|%s@@", _("Unequip")));
             else
-                mBrowserBox->addRow(strprintf("@@use|%s@@", _("Equip")));
+                mBrowserBox->addRow(strprintf("@@equip|%s@@", _("Equip")));
         }
-        else
-            mBrowserBox->addRow(strprintf("@@use|%s@@", _("Use")));
+        if (item->getInfo().getActivatable())
+            mBrowserBox->addRow(strprintf("@@activate|%s@@", _("Activate")));
 
         if (item->getQuantity() > 1)
             mBrowserBox->addRow(strprintf("@@drop|%s@@", _("Drop...")));
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h
index 8fa1052c..d0dc2c69 100644
--- a/src/gui/quitdialog.h
+++ b/src/gui/quitdialog.h
@@ -22,8 +22,6 @@
 #ifndef QUITDIALOG_H
 #define QUITDIALOG_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp
index 257afd7f..2345369e 100644
--- a/src/gui/recorder.cpp
+++ b/src/gui/recorder.cpp
@@ -21,11 +21,11 @@
 #include "gui/recorder.h"
 
 #include "client.h"
+#include "event.h"
 
 #include "gui/chat.h"
 
 #include "gui/widgets/button.h"
-#include "gui/widgets/chattab.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/windowcontainer.h"
 
@@ -84,16 +84,16 @@ void Recorder::setRecordingFile(const std::string &msg)
              * Message should go after mStream is closed so that it isn't
              * recorded.
              */
-            localChatTab->chatLog(_("Finishing recording."), BY_SERVER);
+            SERVER_NOTICE(_("Finishing recording."))
         }
         else
         {
-            localChatTab->chatLog(_("Not currently recording."), BY_SERVER);
+            SERVER_NOTICE(_("Not currently recording."))
         }
     }
     else if (mStream.is_open())
     {
-        localChatTab->chatLog(_("Already recording."), BY_SERVER);
+        SERVER_NOTICE(_("Already recording."))
     }
     else
     {
@@ -101,7 +101,7 @@ void Recorder::setRecordingFile(const std::string &msg)
          * Message should go before mStream is opened so that it isn't
          * recorded.
          */
-        localChatTab->chatLog(_("Starting to record..."), BY_SERVER);
+        SERVER_NOTICE(_("Starting to record..."))
         const std::string file = Client::getLocalDataDirectory() + "/" + msgCopy;
 
         mStream.open(file.c_str(), std::ios_base::trunc);
@@ -109,7 +109,7 @@ void Recorder::setRecordingFile(const std::string &msg)
         if (mStream.is_open())
             setVisible(true);
         else
-            localChatTab->chatLog(_("Failed to start recording."), BY_SERVER);
+            SERVER_NOTICE(_("Failed to start recording."))
     }
 }
 
diff --git a/src/gui/register.h b/src/gui/register.h
index 645b0be8..3c65695b 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -22,8 +22,6 @@
 #ifndef REGISTER_H
 #define REGISTER_H
 
-#include "player.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 13e0ba99..f33111d7 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/sell.h"
 
-#include "npc.h"
+#include "playerinfo.h"
 #include "shopitem.h"
 #include "units.h"
 
@@ -111,6 +111,8 @@ SellDialog::SellDialog(int npcId):
 
     instances.push_back(this);
     setVisible(true);
+
+    PlayerInfo::setBuySellState(BUYSELL_SELLING);
 }
 
 SellDialog::~SellDialog()
@@ -118,6 +120,9 @@ SellDialog::~SellDialog()
     delete mShopItems;
 
     instances.remove(this);
+
+    if (PlayerInfo::getBuySellState() == BUYSELL_SELLING)
+        PlayerInfo::setBuySellState(BUYSELL_NONE);
 }
 
 void SellDialog::reset()
@@ -197,6 +202,11 @@ void SellDialog::action(const gcn::ActionEvent &event)
             // the inventory index of the next Duplicate otherwise.
             itemIndex = item->getCurrentInvIndex();
             sellCount = item->sellCurrentDuplicate(mAmountItems);
+
+            // For Manaserv, the Item id is to be given as index.
+            if ((Net::getNetworkType() == ServerInfo::MANASERV))
+                itemIndex = item->getId();
+
             Net::getNpcHandler()->sellItem(mNpcId, itemIndex, sellCount);
             mAmountItems -= sellCount;
         }
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 32a4dc55..c286dcc2 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -86,11 +86,6 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
         void setVisible(bool visible);
 
         /**
-         * Returns true if any instances exist.
-         */
-        static bool isActive() { return instances.size() > 0; }
-
-        /**
          * Closes all instances.
          */
         static void closeAll();
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 6939d1e7..d68e2eca 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -21,6 +21,7 @@
 
 #include "gui/serverdialog.h"
 
+#include "chatlog.h"
 #include "client.h"
 #include "configuration.h"
 #include "gui.h"
@@ -29,7 +30,6 @@
 
 #include "gui/okdialog.h"
 #include "gui/sdlinput.h"
-#include "gui/theme.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/dropdown.h"
@@ -41,16 +41,18 @@
 
 #include "net/net.h"
 
+#include "resources/theme.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 #include "utils/xml.h"
-#include "widgets/dropdown.h"
 
 #include <guichan/font.hpp>
 
 #include <cstdlib>
 #include <iostream>
 #include <string>
+#include <algorithm>
 
 static const int MAX_SERVERLIST = 6;
 
@@ -198,18 +200,13 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
     mDownloadStatus(DOWNLOADING_PREPARING),
     mDownloadProgress(-1.0f),
     mServers(ServerInfos()),
-#ifndef MANASERV_SUPPORT
-    mManaservServers(ServerInfos()),
-#endif
     mServerInfo(serverInfo)
 {
     setWindowName("ServerDialog");
 
     Label *serverLabel = new Label(_("Server:"));
     Label *portLabel = new Label(_("Port:"));
-#ifdef MANASERV_SUPPORT
     Label *typeLabel = new Label(_("Server type:"));
-#endif
     mServerNameField = new TextField(mServerInfo->hostname);
     mPortField = new TextField(toString(mServerInfo->port));
 
@@ -247,7 +244,6 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
     place(1, 0, mServerNameField, 4).setPadding(3);
     place(0, 1, portLabel);
     place(1, 1, mPortField, 4).setPadding(3);
-#ifdef MANASERV_SUPPORT
     place(0, 2, typeLabel);
     place(1, 2, mTypeField, 4).setPadding(3);
     place(0, 3, usedScroll, 5, 5).setPadding(3);
@@ -256,14 +252,6 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
     place(1, 9, mDeleteButton);
     place(3, 9, mQuitButton);
     place(4, 9, mConnectButton);
-#else
-    place(0, 2, usedScroll, 5, 5).setPadding(3);
-    place(0, 7, mDescription, 5);
-    place(0, 8, mManualEntryButton);
-    place(1, 8, mDeleteButton);
-    place(3, 8, mQuitButton);
-    place(4, 8, mConnectButton);
-#endif
 
     // Make sure the list has enough height
     getLayout().setRowHeight(3, 80);
@@ -360,6 +348,8 @@ void ServerDialog::action(const gcn::ActionEvent &event)
             // Save the selected server
             mServerInfo->save = true;
 
+            chatLogger->setServerName(mServerInfo->hostname);
+
             saveCustomServers(*mServerInfo);
 
             Client::setState(STATE_CONNECT_SERVER);
@@ -427,6 +417,16 @@ void ServerDialog::valueChanged(const gcn::SelectionEvent &)
     mDeleteButton->setEnabled(myServer.save);
 }
 
+void ServerDialog::mouseClicked(gcn::MouseEvent &mouseEvent)
+{
+    if (mouseEvent.getSource() == mServersList &&
+        isDoubleClick(mServersList->getSelected()))
+    {
+        action(gcn::ActionEvent(mConnectButton,
+                                mConnectButton->getActionEventId()));
+    }
+}
+
 void ServerDialog::logic()
 {
     {
@@ -468,12 +468,7 @@ void ServerDialog::setFieldsReadOnly(bool readOnly)
         mServersList->setSelected(-1);
 
         mServerNameField->setText(std::string());
-#ifdef MANASERV_SUPPORT
         mPortField->setText(std::string());
-#else
-        mPortField->setText(std::string("6901"));
-#endif
-
         mServerNameField->requestFocus();
     }
 
@@ -489,10 +484,10 @@ void ServerDialog::setFieldsReadOnly(bool readOnly)
 void ServerDialog::downloadServerList()
 {
     // Try to load the configuration value for the onlineServerList
-    std::string listFile = branding.getValue("onlineServerList", std::string());
+    std::string listFile = branding.getStringValue("onlineServerList");
 
     if (listFile.empty())
-        listFile = config.getValue("onlineServerList", std::string());
+        listFile = config.getStringValue("onlineServerList");
 
     // Fall back to manasource.org when neither branding nor config set it
     if (listFile.empty())
@@ -594,13 +589,61 @@ void ServerDialog::loadServers()
             }
         }
 
-#ifdef MANASERV_SUPPORT
         if (!found)
-#else
-        if (!found && server.type != ServerInfo::MANASERV)
-#endif
             mServers.push_back(server);
     }
+
+    reorderList(config.getIntValue("serverListOrder"));
+}
+
+/**
+ * Returns true if serv1 must appear before serv2
+ */
+bool ServerDialog::sortByLastUsage(const ServerInfo& serv1, const ServerInfo& serv2)
+{
+    int rank1 = -1;
+    int rank2 = -1;
+
+    for (int i = 0; i < MAX_SERVERLIST; ++i)
+    {
+        const std::string index = toString(i);
+        const std::string nameKey = "MostUsedServerName" + index;
+        std::string serv = config.getValue(nameKey, "");
+        if (serv == serv1.hostname)
+            rank1 = i;
+        else if (serv == serv2.hostname)
+            rank2 = i;
+    }
+
+    if (rank1 > rank2)
+        return true;
+
+    if (rank2 > rank1)
+        return false;
+
+    return ServerDialog::sortByName(serv1, serv2);
+}
+
+/**
+ * Returns true if serv1 must appear before serv2
+ */
+bool ServerDialog::sortByName(const ServerInfo& serv1, const ServerInfo& serv2)
+{
+    return compareStrI(serv1.name, serv2.name) < 0;
+}
+
+/**
+ * Reorders the server list
+ * @param orderBy
+ *  - 0 : Order by last change (default)
+ *  - 1 : Order by name
+ */
+void ServerDialog::reorderList(int orderBy)
+{
+    if (orderBy == 0)
+        std::sort(mServers.begin(), mServers.end(), ServerDialog::sortByLastUsage);
+    else
+        std::sort(mServers.begin(), mServers.end(), ServerDialog::sortByName);
 }
 
 void ServerDialog::loadCustomServers()
@@ -625,14 +668,7 @@ void ServerDialog::loadCustomServers()
 
         server.save = true;
 
-#ifdef MANASERV_SUPPORT
         mServers.push_back(server);
-#else
-        if (server.type == ServerInfo::MANASERV)
-            mManaservServers.push_back(server);
-        else
-            mServers.push_back(server);
-#endif
     }
 }
 
@@ -675,27 +711,6 @@ void ServerDialog::saveCustomServers(const ServerInfo &currentServer)
         ++savedServerCount;
     }
 
-#ifndef MANASERV_SUPPORT
-    for (unsigned i = 0;
-         i < mManaservServers.size() && savedServerCount < MAX_SERVERLIST; ++i)
-    {
-        const ServerInfo &server = mManaservServers.at(i);
-
-        // Only save servers that were loaded from settings
-        if (!(server.save && server.isValid()))
-            continue;
-
-        const std::string index = toString(savedServerCount);
-        const std::string nameKey = "MostUsedServerName" + index;
-        const std::string typeKey = "MostUsedServerType" + index;
-        const std::string portKey = "MostUsedServerPort" + index;
-
-        config.setValue(nameKey, toString(server.hostname));
-        config.setValue(typeKey, serverTypeToString(server.type));
-        config.setValue(portKey, toString(server.port));
-        ++savedServerCount;
-    }
-#endif
     // Insert an invalid entry at the end to make the loading stop there
     if (savedServerCount < MAX_SERVERLIST)
         config.setValue("MostUsedServerName" + toString(savedServerCount), "");
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index aae8b2e0..a222912d 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -135,6 +135,8 @@ class ServerDialog : public Window,
          */
         void valueChanged(const gcn::SelectionEvent &event);
 
+        void mouseClicked(gcn::MouseEvent &mouseEvent);
+
         void logic();
 
     protected:
@@ -156,6 +158,11 @@ class ServerDialog : public Window,
 
         void setFieldsReadOnly(bool readOnly);
 
+        static bool sortByLastUsage(const ServerInfo& serv1, const ServerInfo& serv2);
+        static bool sortByName(const ServerInfo& serv1, const ServerInfo& serv2);
+
+        void reorderList(int orderBy);
+
         TextField *mServerNameField;
         TextField *mPortField;
         Label  *mDescription;
@@ -191,9 +198,6 @@ class ServerDialog : public Window,
         float mDownloadProgress;
 
         ServerInfos mServers;
-#ifndef MANASERV_SUPPORT
-        ServerInfos mManaservServers;
-#endif
         ServerInfo *mServerInfo;
 };
 
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 43e83a68..4be94bb8 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -22,8 +22,6 @@
 #ifndef SETUP_H
 #define SETUP_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 2c6b89e8..8e9f5e98 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -35,10 +35,10 @@
 #include "utils/gettext.h"
 
 Setup_Audio::Setup_Audio():
-    mMusicVolume((int)config.getValue("musicVolume", 60)),
-    mSfxVolume((int)config.getValue("sfxVolume", 100)),
-    mSoundEnabled(config.getValue("sound", 0)),
-    mDownloadEnabled(config.getValue("download-music", false)),
+    mMusicVolume(config.getIntValue("musicVolume")),
+    mSfxVolume(config.getIntValue("sfxVolume")),
+    mSoundEnabled(config.getBoolValue("sound")),
+    mDownloadEnabled(config.getBoolValue("download-music")),
     mSoundCheckBox(new CheckBox(_("Sound"), mSoundEnabled)),
     mDownloadMusicCheckBox(new CheckBox(_("Download music"), mDownloadEnabled)),
     mSfxSlider(new Slider(0, sound.getMaxVolume())),
@@ -82,14 +82,14 @@ void Setup_Audio::apply()
 {
     mSoundEnabled = mSoundCheckBox->isSelected();
     mDownloadEnabled = mDownloadMusicCheckBox->isSelected();
-    mSfxVolume = (int) config.getValue("sfxVolume", 100);
-    mMusicVolume = (int) config.getValue("musicVolume", 60);
+    mSfxVolume = config.getIntValue("sfxVolume");
+    mMusicVolume = config.getIntValue("musicVolume");
 
     config.setValue("sound", mSoundEnabled);
 
     // Display a message if user has selected to download music,
     // And if downloadmusic is not already enabled
-    if (mDownloadEnabled && !config.getValue("download-music", false))
+    if (mDownloadEnabled && !config.getBoolValue("download-music"))
     {
         new OkDialog(_("Notice"),_("You may have to restart your client if you want to download new music"));
     }
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 12dba82a..6b3b3fec 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -23,8 +23,6 @@
 #include "configuration.h"
 
 #include "gui/gui.h"
-#include "gui/theme.h"
-#include "gui/userpalette.h"
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/itemlinkhandler.h"
@@ -36,6 +34,9 @@
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/textpreview.h"
 
+#include "resources/theme.h"
+#include "resources/userpalette.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 965f5712..7ac5b5ed 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -40,7 +40,7 @@ Setup_Joystick::Setup_Joystick():
 {
     setName(_("Joystick"));
 
-    mOriginalJoystickEnabled = !config.getValue("joystickEnabled", false);
+    mOriginalJoystickEnabled = !config.getBoolValue("joystickEnabled");
     mJoystickEnabled->setSelected(mOriginalJoystickEnabled);
 
     mJoystickEnabled->addActionListener(this);
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 93551689..e1948bb0 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/setup_players.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
 #include "configuration.h"
 #include "log.h"
 
@@ -214,6 +214,7 @@ public:
 #define ACTION_STRATEGY "strategy"
 #define ACTION_WHISPER_TAB "whisper tab"
 #define ACTION_SHOW_GENDER "show gender"
+#define ACTION_ENABLE_CHAT_LOG "enable log"
 
 Setup_Players::Setup_Players():
     mPlayerTableTitleModel(new StaticTableModel(1, COLUMNS_NR)),
@@ -226,10 +227,12 @@ Setup_Players::Setup_Players():
     mDefaultWhisper(new CheckBox(_("Allow whispers"),
                 player_relations.getDefault() & PlayerRelation::WHISPER)),
     mDeleteButton(new Button(_("Delete"), ACTION_DELETE, this)),
-    mWhisperTab(config.getValue("whispertab", false)),
+    mWhisperTab(config.getBoolValue("whispertab")),
     mWhisperTabCheckBox(new CheckBox(_("Put all whispers in tabs"), mWhisperTab)),
-    mShowGender(config.getValue("showgender", false)),
-    mShowGenderCheckBox(new CheckBox(_("Show gender"), mShowGender))
+    mShowGender(config.getBoolValue("showgender")),
+    mShowGenderCheckBox(new CheckBox(_("Show gender"), mShowGender)),
+    mEnableChatLog(config.getBoolValue("enableChatLog")),
+    mEnableChatLogCheckBox(new CheckBox(_("Enable Chat log"), mEnableChatLog))
 {
     setName(_("Players"));
 
@@ -279,6 +282,9 @@ Setup_Players::Setup_Players():
     mShowGenderCheckBox->setActionEventId(ACTION_SHOW_GENDER);
     mShowGenderCheckBox->addActionListener(this);
 
+    mEnableChatLogCheckBox->setActionEventId(ACTION_ENABLE_CHAT_LOG);
+    mEnableChatLogCheckBox->addActionListener(this);
+
     reset();
 
     // Do the layout
@@ -289,11 +295,12 @@ Setup_Players::Setup_Players():
     place(0, 1, mPlayerScrollArea, 4, 4).setPadding(2);
     place(0, 5, mDeleteButton);
     place(0, 6, mShowGenderCheckBox, 2).setPadding(2);
+    place(0, 7, mEnableChatLogCheckBox, 2).setPadding(2);
     place(2, 5, ignore_action_label);
     place(2, 6, mIgnoreActionChoicesBox, 2).setPadding(2);
-    place(0, 7, mDefaultTrading);
-    place(0, 8, mDefaultWhisper);
-    place(0, 9, mWhisperTabCheckBox, 4).setPadding(4);
+    place(0, 8, mDefaultTrading);
+    place(0, 9, mDefaultWhisper);
+    place(0, 10, mWhisperTabCheckBox, 4).setPadding(4);
 
     player_relations.addListener(this);
 
@@ -341,20 +348,24 @@ void Setup_Players::apply()
                                        PlayerRelation::WHISPER : 0));
     config.setValue("whispertab", mWhisperTab);
 
-    bool showGender = config.getValue("showgender", false);
+    bool showGender = config.getBoolValue("showgender");
 
     config.setValue("showgender", mShowGender);
 
-    if (beingManager && mShowGender != showGender)
-        beingManager->updatePlayerNames();
+    if (actorSpriteManager && mShowGender != showGender)
+        actorSpriteManager->updatePlayerNames();
+
+    config.setValue("enableChatLog", mEnableChatLog);
 }
 
 void Setup_Players::cancel()
 {
-    mWhisperTab = config.getValue("whispertab", false);
+    mWhisperTab = config.getBoolValue("whispertab");
     mWhisperTabCheckBox->setSelected(mWhisperTab);
-    mShowGender = config.getValue("showgender", false);
+    mShowGender = config.getBoolValue("showgender");
     mShowGenderCheckBox->setSelected(mShowGender);
+    mEnableChatLog = config.getBoolValue("enableChatLog");
+    mEnableChatLogCheckBox->setSelected(mEnableChatLog);
 }
 
 void Setup_Players::action(const gcn::ActionEvent &event)
@@ -402,6 +413,10 @@ void Setup_Players::action(const gcn::ActionEvent &event)
     {
         mShowGender = mShowGenderCheckBox->isSelected();
     }
+    else if (event.getId() == ACTION_ENABLE_CHAT_LOG)
+    {
+        mEnableChatLog = mEnableChatLogCheckBox->isSelected();
+    }
 }
 
 void Setup_Players::updatedPlayer(const std::string &name)
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index 5337b213..a62ffe1f 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -70,6 +70,9 @@ private:
 
     bool mShowGender;
     gcn::CheckBox *mShowGenderCheckBox;
+
+    bool mEnableChatLog;
+    gcn::CheckBox *mEnableChatLogCheckBox;
 };
 
 #endif
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 1a5e17b6..2ef7ce6c 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -156,6 +156,31 @@ public:
     }
 };
 
+const char *SERVLIST_ORDER_BY[2] =
+{
+    N_("Last usage"),
+    N_("Name")
+};
+
+class ServerListOrderListModel : public gcn::ListModel
+{
+public:
+    virtual ~ServerListOrderListModel() { }
+
+    virtual int getNumberOfElements()
+    {
+        return 2;
+    }
+
+    virtual std::string getElementAt(int i)
+    {
+        if (i >= getNumberOfElements())
+            return _("???");
+
+        return SERVLIST_ORDER_BY[i];
+    }
+};
+
 static const char *speechModeToString(Being::Speech mode)
 {
     switch (mode)
@@ -171,7 +196,7 @@ static const char *speechModeToString(Being::Speech mode)
 const char *Setup_Video::overlayDetailToString(int detail)
 {
     if (detail == -1)
-        detail = config.getValue("OverlayDetail", -1);
+        detail = config.getIntValue("OverlayDetail");
 
     switch (detail)
     {
@@ -185,7 +210,7 @@ const char *Setup_Video::overlayDetailToString(int detail)
 const char *Setup_Video::particleDetailToString(int detail)
 {
     if (detail == -1)
-        detail = 3 - config.getValue("particleEmitterSkip", -1);
+        detail = 3 - config.getIntValue("particleEmitterSkip");
 
     switch (detail)
     {
@@ -198,22 +223,20 @@ const char *Setup_Video::particleDetailToString(int detail)
 }
 
 Setup_Video::Setup_Video():
-    mFullScreenEnabled(config.getValue("screen", false)),
-    mOpenGLEnabled(config.getValue("opengl", false)),
-    mCustomCursorEnabled(config.getValue("customcursor", true)),
-    mShowMonsterDamageEnabled(config.getValue("showMonstersTakedDamage",
-                                              false)),
-    mVisibleNamesEnabled(config.getValue("visiblenames", true)),
-    mParticleEffectsEnabled(config.getValue("particleeffects", true)),
-    mNameEnabled(config.getValue("showownname", false)),
-    mNPCLogEnabled(config.getValue("logNpcInGui", true)),
-    mPickupChatEnabled(config.getValue("showpickupchat", true)),
-    mPickupParticleEnabled(config.getValue("showpickupparticle", false)),
-    mOpacity(config.getValue("guialpha", 0.8)),
-    mFps((int) config.getValue("fpslimit", 60)),
-    mSDLTransparencyDisabled(config.getValue("disableTransparency", true)),
-    mSpeechMode(static_cast<Being::Speech>(
-            config.getValue("speech", Being::TEXT_OVERHEAD))),
+    mFullScreenEnabled(config.getBoolValue("screen")),
+    mOpenGLEnabled(config.getBoolValue("opengl")),
+    mCustomCursorEnabled(config.getBoolValue("customcursor")),
+    mShowMonsterDamageEnabled(config.getBoolValue("showMonstersTakedDamage")),
+    mVisibleNamesEnabled(config.getBoolValue("visiblenames")),
+    mParticleEffectsEnabled(config.getBoolValue("particleeffects")),
+    mNameEnabled(config.getBoolValue("showownname")),
+    mNPCLogEnabled(config.getBoolValue("logNpcInGui")),
+    mPickupChatEnabled(config.getBoolValue("showpickupchat")),
+    mPickupParticleEnabled(config.getBoolValue("showpickupparticle")),
+    mOpacity(config.getFloatValue("guialpha")),
+    mFps(config.getIntValue("fpslimit")),
+    mSDLTransparencyDisabled(config.getBoolValue("disableTransparency")),
+    mSpeechMode(static_cast<Being::Speech>(config.getIntValue("speech"))),
     mModeListModel(new ModeListModel),
     mModeList(new ListBox(mModeListModel)),
     mFsCheckBox(new CheckBox(_("Full screen"), mFullScreenEnabled)),
@@ -238,13 +261,14 @@ Setup_Video::Setup_Video():
     mFpsCheckBox(new CheckBox(_("FPS limit:"))),
     mFpsSlider(new Slider(10, 120)),
     mFpsLabel(new Label),
-    mOverlayDetail((int) config.getValue("OverlayDetail", 2)),
+    mOverlayDetail(config.getIntValue("OverlayDetail")),
     mOverlayDetailSlider(new Slider(0, 2)),
     mOverlayDetailField(new Label),
-    mParticleDetail(3 - (int) config.getValue("particleEmitterSkip", 1)),
+    mParticleDetail(3 - config.getIntValue("particleEmitterSkip")),
     mParticleDetailSlider(new Slider(0, 3)),
     mParticleDetailField(new Label),
-    mFontSize((int) config.getValue("fontSize", 11)),
+    mFontSize(config.getIntValue("fontSize")),
+    mServerListOrder(config.getIntValue("serverListOrder")),
     mDisableSDLTransparencyCheckBox(
                           new CheckBox(_("Disable transparency (Low CPU mode)"),
                                        mSDLTransparencyDisabled))
@@ -262,10 +286,14 @@ Setup_Video::Setup_Video():
     overlayDetailLabel = new Label(_("Ambient FX"));
     particleDetailLabel = new Label(_("Particle detail"));
     fontSizeLabel = new Label(_("Font size"));
+    serverListOrderLabel = new Label(_("Order servers by"));
 
     mFontSizeListModel = new FontSizeChoiceListModel;
     mFontSizeDropDown = new DropDown(mFontSizeListModel);
 
+    mServerListOrderListModel = new ServerListOrderListModel;
+    mServerListOrderDropDown = new DropDown(mServerListOrderListModel);
+
     mModeList->setEnabled(true);
 
 #ifndef USE_OPENGL
@@ -343,6 +371,9 @@ Setup_Video::Setup_Video():
     mFontSizeDropDown->setSelected(mFontSize - 10);
     mFontSizeDropDown->adjustHeight();
 
+    mServerListOrderDropDown->setSelected(mServerListOrder);
+    mServerListOrderDropDown->adjustHeight();
+
     // Do the layout
     LayoutHelper h(this);
     ContainerPlacer place = h.getPlacer(0, 0);
@@ -389,6 +420,9 @@ Setup_Video::Setup_Video():
 
     place(0, 12, mDisableSDLTransparencyCheckBox, 4);
 
+    place(0, 13, serverListOrderLabel, 3);
+    place(1, 13, mServerListOrderDropDown, 2);
+
     setDimension(gcn::Rectangle(0, 0, 365, 300));
 }
 
@@ -397,13 +431,14 @@ Setup_Video::~Setup_Video()
     delete mModeListModel;
     delete mModeList;
     delete mFontSizeListModel;
+    delete mServerListOrderListModel;
 }
 
 void Setup_Video::apply()
 {
     // Full screen changes
     bool fullscreen = mFsCheckBox->isSelected();
-    if (fullscreen != (config.getValue("screen", false) == 1))
+    if (fullscreen != config.getBoolValue("screen"))
     {
         /* The OpenGL test is only necessary on Windows, since switching
          * to/from full screen works fine on Linux. On Windows we'd have to
@@ -414,7 +449,7 @@ void Setup_Video::apply()
 
 #if defined(WIN32) || defined(__APPLE__)
         // checks for opengl usage
-        if (!(config.getValue("opengl", false) == 1))
+        if (!config.getBoolValue("opengl"))
         {
 #endif
             if (!graphics->setFullscreen(fullscreen))
@@ -495,23 +530,23 @@ void Setup_Video::apply()
     // FPS change
     config.setValue("fpslimit", mFps);
     config.setValue("fontSize", mFontSizeDropDown->getSelected() + 10);
+    config.setValue("serverListOrder", mServerListOrderDropDown->getSelected());
 
     // We sync old and new values at apply time
-    mFullScreenEnabled = config.getValue("screen", false);
-    mCustomCursorEnabled = config.getValue("customcursor", true);
-    mShowMonsterDamageEnabled = config.getValue("showMonstersTakedDamage", false);
-    mVisibleNamesEnabled = config.getValue("visiblenames", true);
-    mParticleEffectsEnabled = config.getValue("particleeffects", true);
-    mNameEnabled = config.getValue("showownname", false);
-    mNPCLogEnabled = config.getValue("logNpcInGui", true);
-    mSpeechMode = static_cast<Being::Speech>(
-            config.getValue("speech", Being::TEXT_OVERHEAD));
-    mOpacity = config.getValue("guialpha", 0.8);
-    mOverlayDetail = (int) config.getValue("OverlayDetail", 2);
-    mOpenGLEnabled = config.getValue("opengl", false);
-    mPickupChatEnabled = config.getValue("showpickupchat", true);
-    mPickupParticleEnabled = config.getValue("showpickupparticle", false);
-    mSDLTransparencyDisabled = config.getValue("disableTransparency", true);
+    mFullScreenEnabled = config.getBoolValue("screen");
+    mCustomCursorEnabled = config.getBoolValue("customcursor");
+    mShowMonsterDamageEnabled = config.getBoolValue("showMonstersTakedDamage");
+    mVisibleNamesEnabled = config.getBoolValue("visiblenames");
+    mParticleEffectsEnabled = config.getBoolValue("particleeffects");
+    mNameEnabled = config.getBoolValue("showownname");
+    mNPCLogEnabled = config.getBoolValue("logNpcInGui");
+    mSpeechMode = static_cast<Being::Speech>(config.getIntValue("speech"));
+    mOpacity = config.getFloatValue("guialpha");
+    mOverlayDetail = config.getIntValue("OverlayDetail");
+    mOpenGLEnabled = config.getBoolValue("opengl");
+    mPickupChatEnabled = config.getBoolValue("showpickupchat");
+    mPickupParticleEnabled = config.getBoolValue("showpickupparticle");
+    mSDLTransparencyDisabled = config.getBoolValue("disableTransparency");
 }
 
 void Setup_Video::cancel()
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index d0e2c492..15a0387e 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -32,6 +32,7 @@
 
 class ModeListModel;
 class FontSizeChoiceListModel;
+class ServerListOrderListModel;
 
 class Setup_Video : public SetupTab, public gcn::ActionListener,
                     public gcn::KeyListener
@@ -67,6 +68,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
 
         ModeListModel *mModeListModel;
         FontSizeChoiceListModel *mFontSizeListModel;
+        ServerListOrderListModel *mServerListOrderListModel;
 
         gcn::Label *speechLabel;
         gcn::Label *alphaLabel;
@@ -75,6 +77,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         gcn::Label *overlayDetailLabel;
         gcn::Label *particleDetailLabel;
         gcn::Label *fontSizeLabel;
+        gcn::Label *serverListOrderLabel;
 
         gcn::ListBox *mModeList;
         gcn::CheckBox *mFsCheckBox;
@@ -108,6 +111,9 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         int mFontSize;
         gcn::DropDown *mFontSizeDropDown;
 
+        int mServerListOrder;
+        gcn::DropDown *mServerListOrderDropDown;
+
         gcn::CheckBox *mDisableSDLTransparencyCheckBox;
 };
 
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 207e3ded..be46132e 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -21,11 +21,11 @@
 
 #include "gui/skilldialog.h"
 
-#include "localplayer.h"
 #include "log.h"
+#include "playerinfo.h"
+#include "configuration.h"
 
 #include "gui/setup.h"
-#include "gui/theme.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/container.h"
@@ -43,6 +43,7 @@
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
@@ -93,7 +94,8 @@ struct SkillInfo
 
         if (!icon)
         {
-            icon = Theme::getImageFromTheme("unknown-item.png");
+            icon = Theme::getImageFromTheme(
+                                       paths.getStringValue("unknownItemFile"));
         }
     }
 
@@ -246,10 +248,6 @@ void SkillDialog::action(const gcn::ActionEvent &event)
     {
         setVisible(false);
     }
-    else
-    {
-        printf("Unknown event '%s'\n", event.getId().c_str());
-    }
 }
 
 std::string SkillDialog::update(int id)
@@ -269,7 +267,7 @@ std::string SkillDialog::update(int id)
 void SkillDialog::update()
 {
     mPointsLabel->setCaption(strprintf(_("Skill points available: %d"),
-                                       player_node->getSkillPoints()));
+                                       PlayerInfo::getAttribute(SKILL_POINTS)));
     mPointsLabel->adjustSize();
 
     for (SkillMap::iterator it = mSkills.begin(); it != mSkills.end(); it++)
@@ -420,10 +418,10 @@ void SkillModel::updateVisibilities()
 
 void SkillInfo::update()
 {
-    int baseLevel = player_node->getAttributeBase(id);
-    int effLevel = player_node->getAttributeEffective(id);
+    int baseLevel = PlayerInfo::getStatBase(id);
+    int effLevel = PlayerInfo::getStatEffective(id);
 
-    std::pair<int, int> exp = player_node->getExperience(id);
+    std::pair<int, int> exp = PlayerInfo::getStatExperience(id);
 
     if (!modifiable && baseLevel == 0 && effLevel == 0 && exp.second == 0)
     {
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index 95f8ef25..3b1b1832 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -19,10 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SKILL_H
-#define SKILL_H
-
-#include "guichanfwd.h"
+#ifndef SKILLDIALOG_H
+#define SKILLDIALOG_H
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index d52e073c..b4321b25 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -20,22 +20,19 @@
 
 #include "gui/socialwindow.h"
 
-#include "beingmanager.h"
+#include "event.h"
 #include "guild.h"
 #include "localplayer.h"
 #include "party.h"
-#include "player.h"
 
 #include "gui/confirmdialog.h"
 #include "gui/okdialog.h"
 #include "gui/setup.h"
 #include "gui/textdialog.h"
-#include "gui/theme.h"
 
 #include "gui/widgets/avatarlistbox.h"
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
-#include "gui/widgets/chattab.h"
 #include "gui/widgets/container.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
@@ -49,6 +46,8 @@
 #include "net/guildhandler.h"
 #include "net/partyhandler.h"
 
+#include "resources/theme.h"
+
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -124,13 +123,10 @@ public:
 
             if (!name.empty())
             {
-                Net::getGuildHandler()->invite(mGuild->getId(), name);
-                localChatTab->chatLog(strprintf(_("Invited user %s to guild %s."),
-                                            name.c_str(),
-                                            mGuild->getName().c_str()),
-                                  BY_SERVER);
+                SERVER_NOTICE(strprintf(_("Invited user %s to guild %s."),
+	                          name.c_str(),
+	                          mGuild->getName().c_str()))
             }
-
             mInviteDialog = NULL;
         }
         else if (event.getId() == "~do invite")
@@ -140,8 +136,8 @@ public:
         else if (event.getId() == "yes")
         {
             Net::getGuildHandler()->leave(mGuild->getId());
-            localChatTab->chatLog(strprintf(_("Guild %s quit requested."),
-                                        mGuild->getName().c_str()), BY_SERVER);
+            SERVER_NOTICE(strprintf(_("Guild %s quit requested."),
+                                        mGuild->getName().c_str()))
             mConfirmDialog = NULL;
         }
         else if (event.getId() == "no")
@@ -208,8 +204,8 @@ public:
             std::string name = mInviteDialog->getText();
 
             if (!name.empty())
-                Net::getPartyHandler()->invite(name);
-
+                SERVER_NOTICE(strprintf(_("Invited user %s to party."),
+                              name.c_str()))
             mInviteDialog = NULL;
         }
         else if (event.getId() == "~do invite")
@@ -219,8 +215,8 @@ public:
         else if (event.getId() == "yes")
         {
             Net::getPartyHandler()->leave();
-            localChatTab->chatLog(strprintf(_("Party %s quit requested."),
-                                        mParty->getName().c_str()), BY_SERVER);
+            SERVER_NOTICE(strprintf(_("Party %s quit requested."),
+                                        mParty->getName().c_str()))
             mConfirmDialog = NULL;
         }
         else if (event.getId() == "no")
@@ -444,14 +440,14 @@ void SocialWindow::action(const gcn::ActionEvent &event)
         // check if they accepted the invite
         if (eventId == "yes")
         {
-            localChatTab->chatLog(strprintf(_("Accepted party invite from %s."),
-                    mPartyInviter.c_str()));
+            SERVER_NOTICE(strprintf(_("Accepted party invite from %s."),
+                    mPartyInviter.c_str()))
             Net::getPartyHandler()->inviteResponse(mPartyInviter, true);
         }
         else if (eventId == "no")
         {
-            localChatTab->chatLog(strprintf(_("Rejected party invite from %s."),
-                    mPartyInviter.c_str()));
+            SERVER_NOTICE(strprintf(_("Rejected party invite from %s."),
+                    mPartyInviter.c_str()))
             Net::getPartyHandler()->inviteResponse(mPartyInviter, false);
         }
 
@@ -463,14 +459,14 @@ void SocialWindow::action(const gcn::ActionEvent &event)
         // check if they accepted the invite
         if (eventId == "yes")
         {
-            localChatTab->chatLog(strprintf(_("Accepted guild invite from %s."),
-                    mPartyInviter.c_str()));
+            SERVER_NOTICE(strprintf(_("Accepted guild invite from %s."),
+                    mPartyInviter.c_str()))
             Net::getGuildHandler()->inviteResponse(mGuildInvited, true);
         }
         else if (eventId == "no")
         {
-            localChatTab->chatLog(strprintf(_("Rejected guild invite from %s."),
-                    mPartyInviter.c_str()));
+            SERVER_NOTICE(strprintf(_("Rejected guild invite from %s."),
+                    mPartyInviter.c_str()))
             Net::getGuildHandler()->inviteResponse(mGuildInvited, false);
         }
 
@@ -498,14 +494,15 @@ void SocialWindow::action(const gcn::ActionEvent &event)
 
         if (name.size() > 16)
         {
-            localChatTab->chatLog(_("Creating guild failed, please choose a "
-                                    "shorter name."), BY_SERVER);
+            SERVER_NOTICE(_("Creating guild failed, please choose a "
+                            "shorter name."));
+            return;
         }
         else if (!name.empty())
         {
             Net::getGuildHandler()->create(name);
-            localChatTab->chatLog(strprintf(_("Creating guild called %s."),
-                                                name.c_str()), BY_SERVER);
+            SERVER_NOTICE(strprintf(_("Creating guild called %s."),
+                                    name.c_str()));
         }
 
         mGuildCreateDialog = NULL;
@@ -520,14 +517,15 @@ void SocialWindow::action(const gcn::ActionEvent &event)
 
         if (name.size() > 16)
         {
-            localChatTab->chatLog(_("Creating party failed, please choose a "
-                                    "shorter name."), BY_SERVER);
+            SERVER_NOTICE(_("Creating party failed, please choose a "
+                            "shorter name."));
+            return;
         }
         else if (!name.empty())
         {
             Net::getPartyHandler()->create(name);
-            localChatTab->chatLog(strprintf(_("Creating party called %s."),
-                                                name.c_str()), BY_SERVER);
+            SERVER_NOTICE(strprintf(_("Creating party called %s."),
+                                    name.c_str()));
         }
 
         mPartyCreateDialog = NULL;
@@ -553,14 +551,14 @@ void SocialWindow::showGuildInvite(const std::string &guildName,
     // check there isnt already an invite showing
     if (mGuildInvited != 0)
     {
-        localChatTab->chatLog(_("Received guild request, but one already "
-                "exists."), BY_SERVER);
+        SERVER_NOTICE(_("Received guild request, but one already "
+                "exists."))
         return;
     }
 
     std::string msg = strprintf(_("%s has invited you to join the guild %s."),
                                 inviterName.c_str(), guildName.c_str());
-    localChatTab->chatLog(msg, BY_SERVER);
+    SERVER_NOTICE(msg)
 
     // show invite
     mGuildAcceptDialog = new ConfirmDialog(_("Accept Guild Invite"), msg, this);
@@ -575,8 +573,7 @@ void SocialWindow::showPartyInvite(const std::string &partyName,
     // check there isnt already an invite showing
     if (mPartyInviter != "")
     {
-        localChatTab->chatLog(_("Received party request, but one already "
-                "exists."), BY_SERVER);
+        SERVER_NOTICE(_("Received party request, but one already exists."))
         return;
     }
 
@@ -607,7 +604,7 @@ void SocialWindow::showPartyInvite(const std::string &partyName,
         }
     }
 
-    localChatTab->chatLog(msg, BY_SERVER);
+    SERVER_NOTICE(msg)
 
     // show invite
     mPartyAcceptDialog = new ConfirmDialog(_("Accept Party Invite"), msg, this);
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index 44551825..b511e4a3 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -20,11 +20,9 @@
 
 #include "gui/specialswindow.h"
 
-#include "localplayer.h"
 #include "log.h"
 
 #include "gui/setup.h"
-#include "gui/theme.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/container.h"
@@ -42,6 +40,9 @@
 #include "net/net.h"
 #include "net/specialhandler.h"
 
+#include "resources/specialdb.h"
+#include "resources/theme.h"
+
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -54,31 +55,24 @@
 
 class SpecialEntry;
 
-struct SpecialInfo
-{
-    unsigned short id;
-    std::string name;
-    std::string icon;
-    SpecialEntry *display;
-};
 
 class SpecialEntry : public Container
 {
     public:
         SpecialEntry(SpecialInfo *info);
 
-        void update();
+        void update(int current, int needed);
 
     protected:
         friend class SpecialsWindow;
         SpecialInfo *mInfo;
 
     private:
-        Icon *mIcon;
-        Label *mNameLabel;
-        Label *mLevelLabel;
-        Label *mTechLabel;
-        Button *mUse;
+        Icon *mIcon;        // icon to display
+        Label *mNameLabel;  // name to display
+        Label *mLevelLabel; // level number label (only shown when applicable)
+        Button *mUse; // use button (only shown when applicable)
+        ProgressBar *mRechargeBar; // recharge bar (only shown when applicable)
 };
 
 SpecialsWindow::SpecialsWindow():
@@ -102,7 +96,6 @@ SpecialsWindow::SpecialsWindow():
 SpecialsWindow::~SpecialsWindow()
 {
     // Clear gui
-    loadSpecials("");
 }
 
 void SpecialsWindow::action(const gcn::ActionEvent &event)
@@ -127,91 +120,70 @@ void SpecialsWindow::action(const gcn::ActionEvent &event)
     }
 }
 
-std::string SpecialsWindow::update(int id)
-{
-    // TODO
-
-    return std::string();
-}
-
-void SpecialsWindow::loadSpecials(const std::string &file)
+void SpecialsWindow::draw(gcn::Graphics *graphics)
 {
-    // TODO: mTabs->clear();
-    while (mTabs->getSelectedTabIndex() != -1)
+    // update the progress bars
+    std::map<int, Special> specialData = PlayerInfo::getSpecialStatus();
+    bool foundNew = false;
+    unsigned int found = 0; // number of entries in specialData which match mEntries
+
+    for (std::map<int, Special>::iterator i = specialData.begin();
+      i != specialData.end();
+      i++)
     {
-        mTabs->removeTabWithIndex(mTabs->getSelectedTabIndex());
-    }
-
-    for (SpecialMap::iterator it = mSpecials.begin(); it != mSpecials.end();  it++)
-    {
-        delete (*it).second->display;
+        std::map<int, SpecialEntry *>::iterator e = mEntries.find(i->first);
+        if (e == mEntries.end())
+        {
+            // found a new special - abort update and rebuild from scratch
+            foundNew = true;
+            break;
+        } else {
+            // update progress bar of special
+            e->second->update(i->second.currentMana, i->second.neededMana);
+            found++;
+        }
     }
-    delete_all(mSpecials);
-    mSpecials.clear();
+    // a rebuild is needed when a) the number of specials changed or b) an existing entry isn't found anymore
+    if (foundNew || found != mEntries.size()) rebuild(specialData);
 
-    if (file.length() == 0)
-        return;
+    Window::draw(graphics);
+}
 
-    XML::Document doc(file);
-    xmlNodePtr root = doc.rootNode();
+void SpecialsWindow::rebuild(const std::map<int, Special> &specialData)
+{
+    make_dtor(mEntries);
+    mEntries.clear();
+    int vPos = 0; //vertical position of next placed element
 
-    if (!root || !xmlStrEqual(root->name, BAD_CAST "specials"))
+    for (std::map<int, Special>::const_iterator i = specialData.begin();
+         i != specialData.end();
+         i++)
     {
-        logger->log("Error loading specials file: %s", file.c_str());
-        return;
-    }
-
-    int setCount = 0;
-    std::string setName;
-    ScrollArea *scroll;
-    FlowContainer *container;
+        logger->log("Updating special GUI for %d", i->first);
 
-    for_each_xml_child_node(set, root)
-    {
-        if (xmlStrEqual(set->name, BAD_CAST "set"))
+        SpecialInfo* info = SpecialDB::get(i->first);
+        if (info)
         {
-            setCount++;
-            setName = XML::getProperty(set, "name", strprintf(_("Specials Set %d"), setCount));
-
-            container = new FlowContainer(SPECIALS_WIDTH, SPECIALS_HEIGHT);
-            container->setOpaque(false);
-            scroll = new ScrollArea(container);
-            scroll->setOpaque(false);
-            scroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
-            scroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
-
-            mTabs->addTab(setName, scroll);
-            for_each_xml_child_node(node, set)
-            {
-                if (xmlStrEqual(node->name, BAD_CAST "special"))
-                {
-                    int id = atoi(XML::getProperty(node, "id", "-1").c_str());
-                    if (id == -1)
-                        continue;
-                    std::string name = XML::getProperty(node, "name", strprintf(_("Special %d"), id));
-                    std::string icon = XML::getProperty(node, "icon", "");
-
-                    SpecialInfo *special = new SpecialInfo;
-                    special->id = id;
-                    special->name = name;
-                    special->icon = icon;
-                    special->display = new SpecialEntry(special);
-
-                    container->add(special->display);
-
-                    mSpecials[id] = special;
-                }
-            }
+            info->rechargeCurrent = i->second.currentMana;
+            info->rechargeNeeded = i->second.neededMana;
+            SpecialEntry* entry = new SpecialEntry(info);
+            entry->setPosition(0, vPos);
+            vPos += entry->getHeight();
+            add(entry);
+            mEntries[i->first] = entry;
+        } else {
+            logger->log("Warning: No info available of special %d", i->first);
         }
     }
 }
 
+
 SpecialEntry::SpecialEntry(SpecialInfo *info) :
     mInfo(info),
     mIcon(NULL),
-    mNameLabel(new Label(info->name)),
-    mLevelLabel(new Label("999")),
-    mUse(new Button("Use", "use", specialsWindow))
+    mLevelLabel(NULL),
+    mUse(NULL),
+    mRechargeBar(NULL)
 {
     setFrameSize(1);
     setOpaque(false);
@@ -225,21 +197,42 @@ SpecialEntry::SpecialEntry(SpecialInfo *info) :
     mIcon->setPosition(1, 0);
     add(mIcon);
 
+
+    mNameLabel = new Label(info->name);
     mNameLabel->setPosition(35, 0);
     add(mNameLabel);
 
-    mLevelLabel->setPosition(getWidth() - mLevelLabel->getWidth(), 0);
-    add(mLevelLabel);
+    if (info->hasLevel)
+    {
+        mLevelLabel = new Label(toString(info->level));
+        mLevelLabel->setPosition(getWidth() - mLevelLabel->getWidth(), 0);
+        add(mLevelLabel);
+    }
+
 
-    mNameLabel->setWidth(mLevelLabel->getX() - mNameLabel->getX() - 1);
+    if (info->isActive)
+    {
+        mUse = new Button("Use", "use", specialsWindow);
+        mUse->setPosition(getWidth() - mUse->getWidth(), 13);
+        add(mUse);
+    }
 
-    mUse->setPosition(getWidth() - mUse->getWidth(), 13);
-    add(mUse);
+    if (info->hasRechargeBar)
+    {
+        float progress = (float)info->rechargeCurrent / (float)info->rechargeNeeded;
+        mRechargeBar = new ProgressBar(progress, 100, 10, Theme::PROG_MP);
+        mRechargeBar->setSmoothProgress(false);
+        mRechargeBar->setPosition(0, 13);
+        add(mRechargeBar);
+    }
 
-    update();
 }
 
-void SpecialEntry::update()
+void SpecialEntry::update(int current, int needed)
 {
-    // TODO
+    if (mRechargeBar)
+    {
+        float progress = (float)current / (float)needed;
+        mRechargeBar->setProgress(progress);
+    }
 }
diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
index 81384856..dedeeffc 100644
--- a/src/gui/specialswindow.h
+++ b/src/gui/specialswindow.h
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include "guichanfwd.h"
+#include "playerinfo.h"
 
 #include "gui/widgets/window.h"
 
@@ -36,7 +36,7 @@ class ScrollArea;
 class Tab;
 class TabbedArea;
 
-struct SpecialInfo;
+struct SpecialEntry;
 
 class SpecialsWindow : public Window, public gcn::ActionListener {
     public:
@@ -49,20 +49,14 @@ class SpecialsWindow : public Window, public gcn::ActionListener {
          */
         void action(const gcn::ActionEvent &actionEvent);
 
-        /**
-         * Update the given special's display
-         */
-        std::string update(int id);
-
-        void loadSpecials(const std::string &file);
-
-        bool hasSpecials() { return !mSpecials.empty(); }
+        void draw(gcn::Graphics *graphics);
 
     private:
-        std::vector<gcn::Button *> mSpellButtons;
-        typedef std::map<int, SpecialInfo*> SpecialMap;
-        SpecialMap mSpecials;
+        // (re)constructs the list of specials
+        void rebuild(const std::map<int, Special> &specialData);
+
         TabbedArea *mTabs;
+        std::map<int, SpecialEntry *> mEntries;
 };
 
 extern SpecialsWindow *specialsWindow;
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 08d00038..e0a9f8a0 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -25,10 +25,12 @@
 #include "graphics.h"
 
 #include "gui/gui.h"
-#include "gui/theme.h"
 
+#include "gui/widgets/label.h"
 #include "gui/widgets/textbox.h"
 
+#include "resources/theme.h"
+
 #include <guichan/font.hpp>
 
 #include <guichan/widgets/label.hpp>
@@ -40,7 +42,7 @@ SpeechBubble::SpeechBubble():
     setMinWidth(29);
     setMinHeight(29);
 
-    mCaption = new gcn::Label;
+    mCaption = new Label;
     mCaption->setFont(boldFont);
 
     mSpeechBox = new TextBox;
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 8682ab7e..6017398a 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -23,10 +23,10 @@
 #ifndef SPEECHBUBBLE_H
 #define SPEECHBUBBLE_H
 
-#include "gui/theme.h"
-
 #include "gui/widgets/popup.h"
 
+#include "resources/theme.h"
+
 class TextBox;
 
 class SpeechBubble : public Popup
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 91f832f5..a3420f06 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -22,11 +22,10 @@
 #include "gui/statuswindow.h"
 
 #include "localplayer.h"
+#include "playerinfo.h"
 #include "units.h"
 
-#include "gui/ministatus.h"
 #include "gui/setup.h"
-#include "gui/theme.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
@@ -38,6 +37,9 @@
 
 #include "net/net.h"
 #include "net/playerhandler.h"
+#include "net/gamehandler.h"
+
+#include "resources/theme.h"
 
 #include "utils/gettext.h"
 #include "utils/mathutils.h"
@@ -94,6 +96,8 @@ class ChangeDisplay : public AttrDisplay, gcn::ActionListener
 StatusWindow::StatusWindow():
     Window(player_node->getName())
 {
+    listen(CHANNEL_ATTRIBUTES);
+
     setWindowName("Status");
     setupWindow->registerWindowForReset(this);
     setResizable(true);
@@ -109,21 +113,26 @@ StatusWindow::StatusWindow():
     mLvlLabel = new Label(strprintf(_("Level: %d"), 0));
     mMoneyLabel = new Label(strprintf(_("Money: %s"), ""));
 
-    int max = player_node->getMaxHp();
+    int max = PlayerInfo::getAttribute(MAX_HP);
     mHpLabel = new Label(_("HP:"));
-    mHpBar = new ProgressBar(max ? (float) player_node->getHp() / max: 0,
-                             80, 15, Theme::PROG_HP);
+    mHpBar = new ProgressBar(max ? (float) PlayerInfo::getAttribute(HP) / max :
+                             0, 80, 15, Theme::PROG_HP);
 
-    max = player_node->getExpNeeded();
+    max = PlayerInfo::getAttribute(EXP_NEEDED);
     mXpLabel = new Label(_("Exp:"));
-    mXpBar = new ProgressBar(max ? (float) player_node->getExp() / max : 0,
-                             80, 15, Theme::PROG_EXP);
+    mXpBar = new ProgressBar(max ? (float) PlayerInfo::getAttribute(EXP) / max :
+                             0, 80, 15, Theme::PROG_EXP);
 
-    max = player_node->getMaxMP();
-    mMpLabel = new Label(_("MP:"));
-    mMpBar = new ProgressBar(max ? (float) player_node->getMaxMP() / max : 0,
-                             80, 15, Net::getPlayerHandler()->canUseMagic() ?
+    bool magicBar = Net::getGameHandler()->canUseMagicBar();
+    if (magicBar)
+    {
+        max = PlayerInfo::getAttribute(MAX_MP);
+        mMpLabel = new Label(_("MP:"));
+        mMpBar = new ProgressBar(max ?
+                             (float) PlayerInfo::getAttribute(MAX_MP) / max :
+                             0, 80, 15, Net::getPlayerHandler()->canUseMagic() ?
                              Theme::PROG_MP : Theme::PROG_NO_MP);
+    }
 
     place(0, 0, mLvlLabel, 3);
     // 5, 0 Job Level
@@ -132,9 +141,17 @@ StatusWindow::StatusWindow():
     place(1, 1, mHpBar, 4);
     place(5, 1, mXpLabel).setPadding(3);
     place(6, 1, mXpBar, 5);
-    place(0, 2, mMpLabel).setPadding(3);
-    // 5, 2 and 6, 2 Job Progress Bar
-    place(1, 2, mMpBar, 4);
+
+    int attributesFirstRow = 2;
+    if (magicBar)
+    {
+        place(0, 2, mMpLabel).setPadding(3);
+        // 5, 2 and 6, 2 Job Progress Bar
+        place(1, 2, mMpBar, 4);
+
+        // We move the attribute row to the next one
+        attributesFirstRow = 3;
+    }
 
     if (Net::getPlayerHandler()->getJobLocation() > 0)
     {
@@ -145,128 +162,131 @@ StatusWindow::StatusWindow():
         place(5, 0, mJobLvlLabel, 3);
         place(5, 2, mJobLabel).setPadding(3);
         place(6, 2, mJobBar, 5);
+
+        // We move the attribute row to the next one
+        attributesFirstRow = 3;
     }
 
     // ----------------------
     // Stats Part
     // ----------------------
 
-    mAttrCont = new VertContainer(32);
+    mAttrCont = new VertContainer(28);
     mAttrScroll = new ScrollArea(mAttrCont);
     mAttrScroll->setOpaque(false);
     mAttrScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mAttrScroll->setVerticalScrollPolicy(ScrollArea::SHOW_AUTO);
-    place(0, 3, mAttrScroll, 5, 3);
+    place(0, attributesFirstRow, mAttrScroll, 5, 3);
 
-    mDAttrCont = new VertContainer(32);
+    mDAttrCont = new VertContainer(28);
     mDAttrScroll = new ScrollArea(mDAttrCont);
     mDAttrScroll->setOpaque(false);
     mDAttrScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mDAttrScroll->setVerticalScrollPolicy(ScrollArea::SHOW_AUTO);
-    place(6, 3, mDAttrScroll, 5, 3);
+    place(6, attributesFirstRow, mDAttrScroll, 5, 3);
 
-    getLayout().setRowHeight(3, Layout::AUTO_SET);
+    getLayout().setRowHeight(attributesFirstRow, Layout::AUTO_SET);
 
-    mCharacterPointsLabel = new Label("C");
-    place(0, 6, mCharacterPointsLabel, 5);
+    mCharacterPointsLabel = new Label("Character points: 0");
+    place(0, attributesFirstRow + 3, mCharacterPointsLabel, 4);
 
     if (Net::getPlayerHandler()->canCorrectAttributes())
     {
-        mCorrectionPointsLabel = new Label("C");
-        place(0, 7, mCorrectionPointsLabel, 5);
+        mCorrectionPointsLabel = new Label("Correction points: 0");
+        place(4, attributesFirstRow + 3, mCorrectionPointsLabel, 4);
     }
 
     loadWindowState();
 
-    update(HP);
-    update(MP);
-    update(EXP);
-    update(MONEY);
-    update(CHAR_POINTS); // This also updates all attributes (none atm)
-    update(LEVEL);
-    int job = Net::getPlayerHandler()->getJobLocation();
-    if (job > 0)
-    {
-        update(job);
-    }
-}
-
-std::string StatusWindow::update(int id)
-{
-    if (miniStatusWindow)
-        miniStatusWindow->update(id);
-
-    if (id == HP)
-    {
-        updateHPBar(mHpBar, true);
-
-        return _("HP");
-    }
-    else if (id == MP)
-    {
+    // Update bars
+    updateHPBar(mHpBar, true);
+    if (magicBar)
         updateMPBar(mMpBar, true);
+    updateXPBar(mXpBar, false);
 
-        return _("MP");
-    }
-    else if (id == EXP)
-    {
-        updateXPBar(mXpBar, false);
 
-        return _("Exp");
-    }
-    else if (id == MONEY)
-    {
-        int money = player_node->getMoney();
-        mMoneyLabel->setCaption(strprintf(_("Money: %s"),
-                                        Units::formatCurrency(money).c_str()));
-        mMoneyLabel->adjustSize();
+    mMoneyLabel->setCaption(strprintf(_("Money: %s"),
+               Units::formatCurrency(PlayerInfo::getAttribute(MONEY)).c_str()));
+    mMoneyLabel->adjustSize();
+    mCharacterPointsLabel->setCaption(strprintf(_("Character points: %d"),
+                                      PlayerInfo::getAttribute(CHAR_POINTS)));
+    mCharacterPointsLabel->adjustSize();
 
-        return _("Money");
-    }
-    else if (id == Net::getPlayerHandler()->getJobLocation())
-    {
-        mJobLvlLabel->setCaption(strprintf(_("Job: %d"),
-                                        player_node->getAttributeBase(id)));
-        mJobLvlLabel->adjustSize();
-
-        updateProgressBar(mJobBar, id, false);
+    mLvlLabel->setCaption(strprintf(_("Level: %d"),
+                          PlayerInfo::getAttribute(LEVEL)));
+    mLvlLabel->adjustSize();
+}
 
-        return _("Job");
-    }
-    else if (id == CHAR_POINTS)
+void StatusWindow::event(Channels channel, const Mana::Event &event)
+{
+    if (event.getName() == EVENT_UPDATEATTRIBUTE)
     {
-        mCharacterPointsLabel->setCaption(strprintf(_("Character points: %d"),
-                                        player_node->getCharacterPoints()));
-        mCharacterPointsLabel->adjustSize();
-
-        if (Net::getPlayerHandler()->canCorrectAttributes())
+        switch(event.getInt("id"))
         {
-            mCorrectionPointsLabel->setCaption(strprintf(_("Correction points: %d"),
-                                            player_node->getCorrectionPoints()));
-            mCorrectionPointsLabel->adjustSize();
+            case HP: case MAX_HP:
+                updateHPBar(mHpBar, true);
+            break;
+
+            case MP: case MAX_MP:
+                updateMPBar(mMpBar, true);
+            break;
+
+            case EXP: case EXP_NEEDED:
+                updateXPBar(mXpBar, false);
+            break;
+
+            case MONEY:
+                mMoneyLabel->setCaption(strprintf(_("Money: %s"),
+                                Units::formatCurrency(
+                                event.getInt("newValue")).c_str()));
+                mMoneyLabel->adjustSize();
+            break;
+
+            case CHAR_POINTS:
+                mCharacterPointsLabel->setCaption(strprintf(
+                                              _("Character points: %d"),
+                                              event.getInt("newValue")));
+                mCharacterPointsLabel->adjustSize();
+                updateAttrs();
+            break;
+
+            case CORR_POINTS:
+                mCorrectionPointsLabel->setCaption(strprintf(
+                                               _("Correction points: %d"),
+                                               event.getInt("newValue")));
+                mCorrectionPointsLabel->adjustSize();
+                updateAttrs();
+            break;
+
+            case LEVEL:
+                mLvlLabel->setCaption(strprintf(_("Level: %d"),
+                                  event.getInt("newValue")));
+                mLvlLabel->adjustSize();
+            break;
         }
-
-        updateAttrs();
     }
-    else if (id == LEVEL)
+    else if (event.getName() == EVENT_UPDATESTAT)
     {
-        mLvlLabel->setCaption(strprintf(_("Level: %d"),
-                                        player_node->getLevel()));
-        mLvlLabel->adjustSize();
+        int id = event.getInt("id");
 
-        return _("Level");
-    }
-    else
-    {
-        Attrs::iterator it = mAttrs.find(id);
+        if (id == Net::getPlayerHandler()->getJobLocation())
+        {
+
+            mJobLvlLabel->setCaption(strprintf(_("Job: %d"),
+                                            PlayerInfo::getStatBase(id)));
+            mJobLvlLabel->adjustSize();
 
-        if (it != mAttrs.end())
+            updateProgressBar(mJobBar, id, false);
+        }
+        else
         {
-            return it->second->update();
+            Attrs::iterator it = mAttrs.find(id);
+            if (it != mAttrs.end())
+            {
+                it->second->update();
+            }
         }
     }
-
-    return "";
 }
 
 void StatusWindow::updateAttrs()
@@ -311,32 +331,39 @@ void StatusWindow::addAttribute(int id, const std::string &name,
 
 void StatusWindow::updateHPBar(ProgressBar *bar, bool showMax)
 {
+    if (!bar)
+        return;
 
     if (showMax)
-        bar->setText(toString(player_node->getHp()) +
-                    "/" + toString(player_node->getMaxHp()));
+        bar->setText(toString(PlayerInfo::getAttribute(HP)) +
+                    "/" + toString(PlayerInfo::getAttribute(MAX_HP)));
     else
-        bar->setText(toString(player_node->getHp()));
+        bar->setText(toString(PlayerInfo::getAttribute(HP)));
 
     float prog = 1.0;
 
-    if (player_node->getMaxHp() > 0)
-        prog = (float) player_node->getHp() / player_node->getMaxHp();
+    if (PlayerInfo::getAttribute(MAX_HP) > 0)
+        prog = (float) PlayerInfo::getAttribute(HP)
+               / PlayerInfo::getAttribute(MAX_HP);
     bar->setProgress(prog);
 }
 
 void StatusWindow::updateMPBar(ProgressBar *bar, bool showMax)
 {
+    if (!bar)
+        return;
+
     if (showMax)
-        bar->setText(toString(player_node->getMP()) +
-                    "/" + toString(player_node->getMaxMP()));
+        bar->setText(toString(PlayerInfo::getAttribute(MP)) +
+                    "/" + toString(PlayerInfo::getAttribute(MAX_MP)));
     else
-        bar->setText(toString(player_node->getMP()));
+        bar->setText(toString(PlayerInfo::getAttribute(MP)));
 
     float prog = 1.0f;
 
-    if (player_node->getMaxMP() > 0)
-        prog = (float) player_node->getMP() / player_node->getMaxMP();
+    if (PlayerInfo::getAttribute(MAX_MP) > 0)
+        prog = (float) PlayerInfo::getAttribute(MP)
+               / PlayerInfo::getAttribute(MAX_MP);
 
     if (Net::getPlayerHandler()->canUseMagic())
         bar->setProgressPalette(Theme::PROG_MP);
@@ -347,8 +374,11 @@ void StatusWindow::updateMPBar(ProgressBar *bar, bool showMax)
 }
 
 void StatusWindow::updateProgressBar(ProgressBar *bar, int value, int max,
-                              bool percent)
+                                     bool percent)
 {
+    if (!bar)
+        return;
+
     if (max == 0)
     {
         bar->setText(_("Max"));
@@ -369,13 +399,16 @@ void StatusWindow::updateProgressBar(ProgressBar *bar, int value, int max,
 
 void StatusWindow::updateXPBar(ProgressBar *bar, bool percent)
 {
-    updateProgressBar(bar, player_node->getExp(),
-                      player_node->getExpNeeded(), percent);
+    if (!bar)
+        return;
+
+    updateProgressBar(bar, PlayerInfo::getAttribute(EXP),
+                      PlayerInfo::getAttribute(EXP_NEEDED), percent);
 }
 
 void StatusWindow::updateProgressBar(ProgressBar *bar, int id, bool percent)
 {
-    std::pair<int, int> exp =  player_node->getExperience(id);
+    std::pair<int, int> exp =  PlayerInfo::getStatExperience(id);
     updateProgressBar(bar, exp.first, exp.second, percent);
 }
 
@@ -400,8 +433,8 @@ AttrDisplay::~AttrDisplay()
 
 std::string AttrDisplay::update()
 {
-    int base = player_node->getAttributeBase(mId);
-    int bonus = player_node->getAttributeEffective(mId) - base;
+    int base = PlayerInfo::getStatBase(mId);
+    int bonus = PlayerInfo::getStatMod(mId);
     std::string value = toString(base);
     if (bonus)
         value += strprintf(" (%+d)", bonus);
@@ -465,9 +498,9 @@ std::string ChangeDisplay::update()
 
     if (mDec)
     {
-        mDec->setEnabled(player_node->getCorrectionPoints());
+        mDec->setEnabled(PlayerInfo::getAttribute(CORR_POINTS));
     }
-    mInc->setEnabled(player_node->getCharacterPoints() >= mNeeded &&
+    mInc->setEnabled(PlayerInfo::getAttribute(CHAR_POINTS) >= mNeeded &&
                      mNeeded > 0);
 
     return AttrDisplay::update();
@@ -485,24 +518,25 @@ void ChangeDisplay::action(const gcn::ActionEvent &event)
     if (Net::getPlayerHandler()->canCorrectAttributes() &&
         event.getSource() == mDec)
     {
-        int newcorpoints = player_node->getCorrectionPoints() - 1;
-        player_node->setCorrectionPoints(newcorpoints);
-        int newpoints = player_node->getCharacterPoints() + 1;
-        player_node->setCharacterPoints(newpoints);
-        int newbase = player_node->getAttributeBase(mId) - 1;
-        player_node->setAttributeBase(mId, newbase);
-        int newmod = player_node->getAttributeEffective(mId) - 1;
-        player_node->setAttributeEffective(mId, newmod);
+        int newcorpoints = PlayerInfo::getAttribute(CORR_POINTS) - 1;
+        PlayerInfo::setAttribute(CORR_POINTS, newcorpoints);
+
+        int newpoints = PlayerInfo::getAttribute(CHAR_POINTS) + 1;
+        PlayerInfo::setAttribute(CHAR_POINTS, newpoints);
+
+        int newbase = PlayerInfo::getStatBase(mId) - 1;
+        PlayerInfo::setStatBase(mId, newbase);
+
         Net::getPlayerHandler()->decreaseAttribute(mId);
     }
     else if (event.getSource() == mInc)
     {
-        int newpoints = player_node->getCharacterPoints() - 1;
-        player_node->setCharacterPoints(newpoints);
-        int newbase = player_node->getAttributeBase(mId) + 1;
-        player_node->setAttributeBase(mId, newbase);
-        int newmod = player_node->getAttributeEffective(mId) + 1;
-        player_node->setAttributeEffective(mId, newmod);
+        int newpoints = PlayerInfo::getAttribute(CHAR_POINTS) - 1;
+        PlayerInfo::setAttribute(CHAR_POINTS, newpoints);
+
+        int newbase = PlayerInfo::getStatBase(mId) + 1;
+        PlayerInfo::setStatBase(mId, newbase);
+
         Net::getPlayerHandler()->increaseAttribute(mId);
     }
 }
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index d99368b8..103111a7 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -22,7 +22,7 @@
 #ifndef STATUS_H
 #define STATUS_H
 
-#include "guichanfwd.h"
+#include "listener.h"
 
 #include "gui/widgets/window.h"
 
@@ -40,24 +40,15 @@ class VertContainer;
  *
  * \ingroup Interface
  */
-class StatusWindow : public Window
+class StatusWindow : public Window, public Mana::Listener
 {
     public:
-        enum { // Some update constants
-            HP = -1,
-            MP = -2,
-            EXP = -3,
-            MONEY = -4,
-            CHAR_POINTS = -5,
-            LEVEL = -6
-        };
-
         /**
          * Constructor.
          */
         StatusWindow();
 
-        std::string update(int id);
+        void event(Channels channel, const Mana::Event &event);
 
         void updateAttrs();
 
diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp
index d9728357..f88a6afa 100644
--- a/src/gui/textdialog.cpp
+++ b/src/gui/textdialog.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/textdialog.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
@@ -42,7 +42,7 @@ TextDialog::TextDialog(const std::string &title, const std::string &msg,
     // In TextField the escape key will either cause autoComplete or lose focus
     mTextField = new TextField("", ! autoCompleteEnabled);
     if (autoCompleteEnabled)
-        mTextField->setAutoComplete(beingManager->getPlayerNameLister());
+        mTextField->setAutoComplete(actorSpriteManager->getPlayerNameLister());
 
     mTextField->addActionListener(this);
 
diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp
index 6aeae319..d0a0c495 100644
--- a/src/gui/textpopup.cpp
+++ b/src/gui/textpopup.cpp
@@ -26,6 +26,8 @@
 #include "gui/gui.h"
 #include "gui/palette.h"
 
+#include "gui/widgets/label.h"
+
 #include "graphics.h"
 #include "units.h"
 
@@ -40,10 +42,10 @@ TextPopup::TextPopup():
 {
     const int fontHeight = getFont()->getHeight();
 
-    mText1 = new gcn::Label;
+    mText1 = new Label;
     mText1->setPosition(getPadding(), getPadding());
 
-    mText2 = new gcn::Label;
+    mText2 = new Label;
     mText2->setPosition(getPadding(), fontHeight + getPadding());
 
     add(mText1);
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index dcb38e8e..37662bef 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -21,9 +21,11 @@
 
 #include "gui/trade.h"
 
+#include "event.h"
 #include "inventory.h"
 #include "item.h"
 #include "localplayer.h"
+#include "playerinfo.h"
 #include "units.h"
 
 #include "gui/inventorywindow.h"
@@ -31,7 +33,6 @@
 #include "gui/setup.h"
 
 #include "gui/widgets/button.h"
-#include "gui/widgets/chattab.h"
 #include "gui/widgets/itemcontainer.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/scrollarea.h"
@@ -59,7 +60,7 @@ TradeWindow::TradeWindow():
     mMyInventory(new Inventory(Inventory::TRADE)),
     mPartnerInventory(new Inventory(Inventory::TRADE)),
     mStatus(PROPOSING)
-{    
+{
     setWindowName("Trade");
     setResizable(true);
     setCloseButton(true);
@@ -96,7 +97,7 @@ TradeWindow::TradeWindow():
 
     mMoneyLabel = new Label(strprintf(_("You get %s"), ""));
     gcn::Label *mMoneyLabel2 = new Label(_("You give:"));
-    
+
     mMoneyField = new TextField;
     mMoneyField->setWidth(40);
     mMoneyChangeButton = new Button(_("Change"), "money", this);
@@ -140,18 +141,6 @@ void TradeWindow::addItem(int id, bool own, int quantity)
     (own ? mMyInventory : mPartnerInventory)->addItem(id, quantity);
 }
 
-void TradeWindow::addItem(int id, bool own, int quantity, bool equipment)
-{
-    if (own)
-    {
-        mMyInventory->addItem(id, quantity, equipment);
-    }
-    else
-    {
-        mPartnerInventory->addItem(id, quantity, equipment);
-    }
-}
-
 void TradeWindow::changeQuantity(int index, bool own, int quantity)
 {
     if (own)
@@ -270,9 +259,8 @@ void TradeWindow::action(const gcn::ActionEvent &event)
 
         if (mMyInventory->contains(item))
         {
-           localChatTab->chatLog(_("Failed adding item. You can not "
-                                  "overlap one kind of item on the window."),
-                                  BY_SERVER);
+           SERVER_NOTICE(_("Failed adding item. You can not "
+                                  "overlap one kind of item on the window."))
             return;
         }
 
@@ -285,7 +273,7 @@ void TradeWindow::action(const gcn::ActionEvent &event)
     {
         setVisible(false);
         reset();
-        player_node->setTrading(false);
+        PlayerInfo::setTrading(false);
 
         Net::getTradeHandler()->cancel();
     }
@@ -310,11 +298,10 @@ void TradeWindow::action(const gcn::ActionEvent &event)
             return;
 
         int v = atoi(mMoneyField->getText().c_str());
-        int curMoney = player_node->getMoney();
+        int curMoney = PlayerInfo::getAttribute(MONEY);
         if (v > curMoney)
         {
-            localChatTab->chatLog(_("You don't have enough money."),
-                                  BY_SERVER);
+            SERVER_NOTICE(_("You don't have enough money."))
             v = curMoney;
         }
         Net::getTradeHandler()->setMoney(v);
diff --git a/src/gui/trade.h b/src/gui/trade.h
index ac602669..e22f8863 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -22,8 +22,6 @@
 #ifndef TRADE_H
 #define TRADE_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h
index dd330afd..87999d5d 100644
--- a/src/gui/unregisterdialog.h
+++ b/src/gui/unregisterdialog.h
@@ -22,8 +22,6 @@
 #ifndef UNREGISTERDIALOG_H
 #define UNREGISTERDIALOG_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 7448a102..23d23b5e 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -476,7 +476,7 @@ void UpdaterWindow::logic()
                         // This statement checks to see if the file type is music, and if download-music is true
                         // If it fails, this statement returns true, and results in not downloading the file
                         // Else it will ignore the break, and download the file.
-                        if ( !(thisFile.type == "music" && config.getValue("download-music", false)) )
+                        if ( !(thisFile.type == "music" && config.getBoolValue("download-music")) )
                         {
                             mUpdateIndex++;
                             break;
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index b18b9b0b..9d03cab5 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -21,16 +21,14 @@
 
 #include "gui/viewport.h"
 
+#include "actorspritemanager.h"
 #include "client.h"
-#include "beingmanager.h"
 #include "configuration.h"
-#include "flooritemmanager.h"
 #include "graphics.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
 #include "map.h"
-#include "monster.h"
-#include "npc.h"
+#include "playerinfo.h"
 #include "textmanager.h"
 
 #include "gui/gui.h"
@@ -40,11 +38,12 @@
 
 #include "net/net.h"
 
-#include "resources/monsterinfo.h"
 #include "resources/resourcemanager.h"
 
 #include "utils/stringutils.h"
 
+#include <cmath>
+
 extern volatile int tick_time;
 
 Viewport::Viewport():
@@ -62,18 +61,18 @@ Viewport::Viewport():
     setOpaque(false);
     addMouseListener(this);
 
-    mScrollLaziness = (int) config.getValue("ScrollLaziness", 16);
-    mScrollRadius = (int) config.getValue("ScrollRadius", 0);
-    mScrollCenterOffsetX = (int) config.getValue("ScrollCenterOffsetX", 0);
-    mScrollCenterOffsetY = (int) config.getValue("ScrollCenterOffsetY", 0);
-
-    config.addListener("ScrollLaziness", this);
-    config.addListener("ScrollRadius", this);
+    mScrollLaziness = config.getIntValue("ScrollLaziness");
+    mScrollRadius = config.getIntValue("ScrollRadius");
+    mScrollCenterOffsetX = config.getIntValue("ScrollCenterOffsetX");
+    mScrollCenterOffsetY = config.getIntValue("ScrollCenterOffsetY");
 
     mPopupMenu = new PopupMenu;
     mBeingPopup = new BeingPopup;
 
     setFocusable(true);
+
+    listen(CHANNEL_CONFIG);
+    listen(CHANNEL_ACTORSPRITE);
 }
 
 Viewport::~Viewport()
@@ -124,9 +123,9 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
     if (mScrollLaziness < 1)
         mScrollLaziness = 1; // Avoids division by zero
 
-    // Apply lazy scrolling
     while (lastTick < tick_time)
     {
+        // Apply lazy scrolling
         if (player_x > mPixelViewX + mScrollRadius)
         {
             mPixelViewX += (player_x - mPixelViewX - mScrollRadius) /
@@ -147,6 +146,22 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
             mPixelViewY += (player_y - mPixelViewY + mScrollRadius) /
                             mScrollLaziness;
         }
+
+        // manage shake effect
+        for (ShakeEffects::iterator i = mShakeEffects.begin();
+             i != mShakeEffects.end();
+             i++)
+        {
+            // apply the effect to viewport
+            mPixelViewX += i->x *= -i->decay;
+            mPixelViewY += i->y *= -i->decay;
+            // check death conditions
+            if (abs(i->x) + abs(i->y) < 1.0f ||
+                (i->duration > 0 && --i->duration == 0))
+            {
+                i = mShakeEffects.erase(i);
+            }
+        }
         lastTick++;
     }
 
@@ -207,12 +222,15 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
     }
 
     // Draw player names, speech, and emotion sprite as needed
-    const Beings &beings = beingManager->getAll();
-    for (Beings::const_iterator i = beings.begin(), i_end = beings.end();
-         i != i_end; ++i)
+    const ActorSprites &actors = actorSpriteManager->getAll();
+    for (ActorSpritesConstIterator it = actors.begin(), it_end = actors.end();
+         it != it_end; it++)
     {
-        (*i)->drawSpeech((int) mPixelViewX, (int) mPixelViewY);
-        (*i)->drawEmotion(graphics, (int) mPixelViewX, (int) mPixelViewY);
+        if ((*it)->getType() == ActorSprite::FLOOR_ITEM)
+            continue;
+
+        Being *b = static_cast<Being*>(*it);
+        b->drawSpeech((int) mPixelViewX, (int) mPixelViewY);
     }
 
     if (miniStatusWindow)
@@ -222,6 +240,24 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
     WindowContainer::draw(gcnGraphics);
 }
 
+void Viewport::shakeScreen(int intensity)
+{
+    float direction = rand()%628 / 100.0f; // random value between 0 and 2PI
+    float x = std::sin(direction) * intensity;
+    float y = std::cos(direction) * intensity;
+    shakeScreen(x, y);
+}
+
+void Viewport::shakeScreen(float x, float y, float decay, unsigned duration)
+{
+    ShakeEffect effect;
+    effect.x = x;
+    effect.y = y;
+    effect.decay = decay;
+    effect.duration = duration;
+    mShakeEffects.push_back(effect);
+}
+
 void Viewport::logic()
 {
     WindowContainer::logic();
@@ -345,7 +381,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
         return;
 
     // Check if we are busy
-    if (NPC::isTalking())
+    if (PlayerInfo::isTalking())
         return;
 
     mPlayerFollowMouse = false;
@@ -354,9 +390,8 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
     const int pixelX = event.getX() + (int) mPixelViewX;
     const int pixelY = event.getY() + (int) mPixelViewY;
 
-    mHoverBeing = beingManager->findBeingByPixel(pixelX, pixelY);
-    mHoverItem = floorItemManager->
-                            findByCoordinates(pixelX / mMap->getTileWidth(),
+    mHoverBeing = actorSpriteManager->findBeingByPixel(pixelX, pixelY);
+    mHoverItem = actorSpriteManager->findItem(pixelX / mMap->getTileWidth(),
                                               pixelY / mMap->getTileHeight());
 
     updateCursorType();
@@ -389,33 +424,20 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
         // Interact with some being
         if (mHoverBeing)
         {
-            switch (mHoverBeing->getType())
+            if (mHoverBeing->canTalk())
+                mHoverBeing->talkTo();
+            else
             {
-                // Talk to NPCs
-                case Being::NPC:
-                    static_cast<NPC*>(mHoverBeing)->talk();
-                    break;
-
-                // Attack or walk to monsters or players
-                case Being::MONSTER:
-                case Being::PLAYER:
-                    // Ignore it if its dead
-                    if (!mHoverBeing->isAlive())
-                        break;
-
+                // Ignore it if its dead
+                if (mHoverBeing->isAlive())
+                {
                     if (player_node->withinAttackRange(mHoverBeing) ||
                         keyboard.isKeyActive(keyboard.KEY_ATTACK))
-                    {
                         player_node->attack(mHoverBeing,
                             !keyboard.isKeyActive(keyboard.KEY_TARGET));
-                    }
                     else
-                    {
                         player_node->setGotoTarget(mHoverBeing);
-                    }
-                    break;
-                default:
-                    break;
+                }
              }
         // Picks up a item if we clicked on one
         }
@@ -440,8 +462,8 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
     else if (event.getButton() == gcn::MouseEvent::MIDDLE)
     {
         // Find the being nearest to the clicked position
-        Being *target = beingManager->findNearestLivingBeing(
-                pixelX, pixelY, 20, Being::MONSTER);
+        Being *target = actorSpriteManager->findNearestLivingBeing(
+                pixelX, pixelY, 20, ActorSprite::MONSTER);
 
         if (target)
              player_node->setTarget(target);
@@ -467,9 +489,9 @@ void Viewport::mouseDragged(gcn::MouseEvent &event)
         }
         else
         {
-          if (mLocalWalkTime != player_node->getWalkTime())
+          if (mLocalWalkTime != player_node->getActionTime())
           {
-              mLocalWalkTime = player_node->getWalkTime();
+              mLocalWalkTime = player_node->getActionTime();
               int destX = (event.getX() + mPixelViewX) / mMap->getTileWidth();
               int destY = (event.getY() + mPixelViewY) / mMap->getTileHeight();
               player_node->setDestination(destX, destY);
@@ -497,12 +519,6 @@ void Viewport::closePopupMenu()
     mPopupMenu->handleLink("cancel");
 }
 
-void Viewport::optionChanged(const std::string &name)
-{
-    mScrollLaziness = (int) config.getValue("ScrollLaziness", 32);
-    mScrollRadius = (int) config.getValue("ScrollRadius", 32);
-}
-
 void Viewport::mouseMoved(gcn::MouseEvent &event)
 {
     // Check if we are on the map
@@ -512,15 +528,11 @@ void Viewport::mouseMoved(gcn::MouseEvent &event)
     const int x = (event.getX() + (int) mPixelViewX);
     const int y = (event.getY() + (int) mPixelViewY);
 
-    mHoverBeing = beingManager->findBeingByPixel(x, y);
-    if (mHoverBeing && mHoverBeing->getType() == Being::PLAYER)
-        mBeingPopup->show(getMouseX(), getMouseY(),
-                          static_cast<Player*>(mHoverBeing));
-    else
-        mBeingPopup->setVisible(false);
+    mHoverBeing = actorSpriteManager->findBeingByPixel(x, y);
+    mBeingPopup->show(getMouseX(), getMouseY(), mHoverBeing);
 
-    mHoverItem = floorItemManager->findByCoordinates(x / mMap->getTileWidth(),
-                                                    y / mMap->getTileHeight());
+    mHoverItem = actorSpriteManager->findItem(x / mMap->getTileWidth(),
+                                              y / mMap->getTileHeight());
 
     updateCursorType();
 }
@@ -532,12 +544,12 @@ void Viewport::updateCursorType()
         switch (mHoverBeing->getType())
         {
             // NPCs
-            case Being::NPC:
+            case ActorSprite::NPC:
                 gui->setCursorType(Gui::CURSOR_TALK);
                 break;
 
             // Monsters
-            case Being::MONSTER:
+            case ActorSprite::MONSTER:
                 gui->setCursorType(Gui::CURSOR_FIGHT);
                 break;
             default:
@@ -559,7 +571,7 @@ void Viewport::updateCursorType()
 void Viewport::toggleDebugPath()
 {
     mShowDebugPath++;
-    if (mShowDebugPath > Map::MAP_SPECIAL)
+    if (mShowDebugPath > Map::MAP_SPECIAL3)
         mShowDebugPath = Map::MAP_NORMAL;
     if (mMap)
     {
@@ -572,8 +584,26 @@ void Viewport::hideBeingPopup()
     mBeingPopup->setVisible(false);
 }
 
-void Viewport::clearHoverBeing(Being *being)
+void Viewport::event(Channels channel, const Mana::Event &event)
 {
-    if (mHoverBeing == being)
-        mHoverBeing = 0;
+    if (channel == CHANNEL_ACTORSPRITE && event.getName() == EVENT_DESTROYED)
+    {
+        ActorSprite *actor = event.getActor("source");
+
+        if (mHoverBeing == actor)
+            mHoverBeing = 0;
+
+        if (mHoverItem == actor)
+            mHoverItem = 0;
+    }
+    else if (channel == CHANNEL_CONFIG &&
+             event.getName() == EVENT_CONFIGOPTIONCHANGED)
+    {
+        const std::string option = event.getString("option");
+        if (option == "ScrollLaziness" || option == "ScrollRadius")
+        {
+            mScrollLaziness = config.getIntValue("ScrollLaziness");
+            mScrollRadius = config.getIntValue("ScrollRadius");
+        }
+    }
 }
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 616b88be..f4db806b 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -22,14 +22,16 @@
 #ifndef VIEWPORT_H
 #define VIEWPORT_H
 
-#include "beingmanager.h"
-#include "configlistener.h"
+#include "listener.h"
 #include "position.h"
 
 #include "gui/widgets/windowcontainer.h"
 
 #include <guichan/mouselistener.hpp>
 
+#include <list>
+
+class ActorSprite;
 class Being;
 class BeingPopup;
 class FloorItem;
@@ -52,7 +54,7 @@ const int walkingMouseDelay = 500;
  * coordinates.
  */
 class Viewport : public WindowContainer, public gcn::MouseListener,
-    public ConfigListener
+        public Mana::Listener
 {
     public:
         /**
@@ -119,11 +121,6 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         void closePopupMenu();
 
         /**
-         * A relevant config option changed.
-         */
-        void optionChanged(const std::string &name);
-
-        /**
          * Returns camera x offset in pixels.
          */
         int getCameraX() const { return (int) mPixelViewX; }
@@ -158,11 +155,23 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
          */
         void hideBeingPopup();
 
-    protected:
-        friend class BeingManager;
+        /**
+         * Makes the screen shake in a random direction
+         */
+        void shakeScreen(int intensity);
 
-        /// Clears the hovered being if it matches
-        void clearHoverBeing(Being *being);
+        /**
+         * Makes the screen shake in a specific direction
+         */
+        void shakeScreen(float x, float y, float decay = 0.95f, unsigned duration = 0);
+
+        /**
+         * Stops all active screen shake effects
+         */
+        void shakeScreenStop()
+        { mShakeEffects.clear(); }
+
+        void event(Channels channel, const Mana::Event &event);
 
     private:
         /**
@@ -199,6 +208,16 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         float mPixelViewY;           /**< Current viewpoint in pixels. */
         int mShowDebugPath;         /**< Show a path from player to pointer. */
 
+        struct ShakeEffect
+        {
+            float x;
+            float y;
+            float decay;
+            unsigned duration;
+        };
+        typedef std::list<ShakeEffect> ShakeEffects;
+        ShakeEffects mShakeEffects;
+
         bool mPlayerFollowMouse;
 
         int mLocalWalkTime; /**< Timestamp before the next walk can be sent. */
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index cc2c7d6a..60837ea1 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -24,10 +24,10 @@
 
 #include "gui/gui.h"
 #include "gui/palette.h"
-#include "gui/theme.h"
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
+#include "resources/theme.h"
 
 #include "utils/stringutils.h"
 
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index b74e4e0e..d553312b 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -24,10 +24,10 @@
 
 #include "client.h"
 
-#include "gui/theme.h"
-
 #include "gui/widgets/linkhandler.h"
 
+#include "resources/theme.h"
+
 #include <guichan/graphics.hpp>
 #include <guichan/font.hpp>
 #include <guichan/cliprectangle.hpp>
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 26e0ad90..3d3a07c2 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -25,9 +25,9 @@
 #include "graphics.h"
 
 #include "gui/palette.h"
-#include "gui/theme.h"
 
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 
@@ -125,8 +125,8 @@ Button::~Button()
 
 void Button::updateAlpha()
 {
-    float alpha = std::max(config.getValue("guialpha", 0.8f),
-                           (double) Theme::instance()->getMinimumOpacity());
+    float alpha = std::max(config.getFloatValue("guialpha"),
+                           Theme::instance()->getMinimumOpacity());
 
     if (mAlpha != alpha)
     {
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index bbb2b8bb..c86eb2ea 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -21,7 +21,8 @@
 
 #include "gui/widgets/chattab.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
+#include "chatlog.h"
 #include "commandhandler.h"
 #include "configuration.h"
 #include "localplayer.h"
@@ -51,7 +52,7 @@ ChatTab::ChatTab(const std::string &name) : Tab()
 
     mTextOutput = new BrowserBox(BrowserBox::AUTO_WRAP);
     mTextOutput->setOpaque(false);
-    mTextOutput->setMaxRow((int) config.getValue("ChatLogLength", 0));
+    mTextOutput->setMaxRow((int) config.getIntValue("ChatLogLength"));
     mTextOutput->setLinkHandler(chatWindow->mItemLinkHandler);
     mTextOutput->setAlwaysUpdate(false);
 
@@ -73,7 +74,7 @@ ChatTab::~ChatTab()
     delete mScrollArea;
 }
 
-void ChatTab::chatLog(std::string line, int own, bool ignoreRecord)
+void ChatTab::chatLog(std::string line, Own own, bool ignoreRecord)
 {
     // Trim whitespace
     trim(line);
@@ -182,6 +183,9 @@ void ChatTab::chatLog(std::string line, int own, bool ignoreRecord)
 
     line = lineColor + timeStr.str() + tmp.nick + tmp.text;
 
+    if (config.getBoolValue("enableChatLog"))
+        saveToLogFile(line);
+
     // We look if the Vertical Scroll Bar is set at the max before
     // adding a row, otherwise the max will always be a row higher
     // at comparison.
@@ -234,7 +238,7 @@ void ChatTab::chatInput(const std::string &message)
 
             std::string temp = msg.substr(start + 1, end - start - 1);
 
-            const ItemInfo itemInfo = ItemDB::get(temp);
+            const ItemInfo itemInfo = itemDb->get(temp);
             if (itemInfo.getId() != 0)
             {
                 msg.insert(end, "@@");
@@ -279,7 +283,13 @@ void ChatTab::handleCommand(const std::string &msg)
 
 void ChatTab::getAutoCompleteList(std::vector<std::string> &names) const
 {
-    beingManager->getPlayerNPCNameLister()->getAutoCompleteList(names);
+    actorSpriteManager->getPlayerNPCNameLister()->getAutoCompleteList(names);
+}
+
+void ChatTab::saveToLogFile(std::string &msg)
+{
+    if (chatLogger)
+        chatLogger->log(msg);
 }
 
 void ChatTab::addRow(std::string &line)
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index c2dfa1c1..1e187f23 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -31,18 +31,6 @@ class BrowserBox;
 class Recorder;
 class ScrollArea;
 
-enum
-{
-    BY_GM,
-    BY_PLAYER,
-    BY_OTHER,
-    BY_SERVER,
-    BY_CHANNEL,
-    ACT_WHISPER,      // getting whispered at
-    ACT_IS,           // equivalent to "/me" on IRC
-    BY_LOGGER
-};
-
 /**
  * A tab for the chat window. This is special to ease chat handling.
  */
@@ -63,7 +51,8 @@ class ChatTab : public Tab, public AutoCompleteLister
          * @param channelName which channel to send the message to.
          * @param ignoreRecord should this not be recorded?
          */
-        void chatLog(std::string line, int own = BY_SERVER, bool ignoreRecord = false);
+        void chatLog(std::string line, Own own = BY_SERVER,
+                     bool ignoreRecord = false);
 
         /**
          * Adds the text to the message list
@@ -112,8 +101,11 @@ class ChatTab : public Tab, public AutoCompleteLister
                                    const std::string &args)
         { return false; }
 
+
         void getAutoCompleteList(std::vector<std::string> &names) const;
 
+        virtual void saveToLogFile(std::string &msg);
+
     protected:
         friend class ChatWindow;
         friend class WhisperWindow;
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index f9002166..6a44132d 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -25,9 +25,9 @@
 #include "graphics.h"
 
 #include "gui/palette.h"
-#include "gui/theme.h"
 
 #include "resources/image.h"
+#include "resources/theme.h"
 
 int CheckBox::instances = 0;
 float CheckBox::mAlpha = 1.0;
@@ -92,8 +92,8 @@ void CheckBox::draw(gcn::Graphics* graphics)
 
 void CheckBox::updateAlpha()
 {
-    float alpha = std::max(config.getValue("guialpha", 0.8f),
-                       (double) Theme::instance()->getMinimumOpacity());
+    float alpha = std::max(config.getFloatValue("guialpha"),
+                           Theme::instance()->getMinimumOpacity());
 
     if (mAlpha != alpha)
     {
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 6c3417e7..ced9c38b 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -26,12 +26,12 @@
 
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
-#include "gui/theme.h"
 
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 
@@ -110,8 +110,8 @@ DropDown::~DropDown()
 
 void DropDown::updateAlpha()
 {
-    float alpha = std::max(config.getValue("guialpha", 0.8f),
-                       (double) Theme::instance()->getMinimumOpacity());
+    float alpha = std::max(config.getFloatValue("guialpha"),
+                           Theme::instance()->getMinimumOpacity());
 
     if (mAlpha != alpha)
     {
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 82fb9f8d..f7a6ca2b 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -20,11 +20,11 @@
 
 #include "gui/widgets/emoteshortcutcontainer.h"
 
-#include "animatedsprite.h"
 #include "configuration.h"
 #include "emoteshortcut.h"
 #include "graphics.h"
 #include "inventory.h"
+#include "imagesprite.h"
 #include "item.h"
 #include "itemshortcut.h"
 #include "keyboardconfig.h"
@@ -32,10 +32,10 @@
 #include "log.h"
 
 #include "gui/palette.h"
-#include "gui/theme.h"
 
 #include "resources/emotedb.h"
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 
@@ -51,12 +51,12 @@ EmoteShortcutContainer::EmoteShortcutContainer():
 
     mBackgroundImg = Theme::getImageFromTheme("item_shortcut_bgr.png");
 
-    mBackgroundImg->setAlpha(config.getValue("guialpha", 0.8));
+    mBackgroundImg->setAlpha(config.getFloatValue("guialpha"));
 
     // Setup emote sprites
     for (int i = 0; i <= EmoteDB::getLast(); i++)
     {
-        mEmoteImg.push_back(EmoteDB::getAnimation(i));
+        mEmoteImg.push_back(EmoteDB::get(i)->sprite);
     }
 
     mMaxItems = EmoteDB::getLast() < MAX_ITEMS ? EmoteDB::getLast() : MAX_ITEMS;
@@ -72,9 +72,9 @@ EmoteShortcutContainer::~EmoteShortcutContainer()
 
 void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
 {
-    if (config.getValue("guialpha", 0.8) != mAlpha)
+    if (config.getFloatValue("guialpha") != mAlpha)
     {
-        mAlpha = config.getValue("guialpha", 0.8);
+        mAlpha = config.getFloatValue("guialpha");
         mBackgroundImg->setAlpha(mAlpha);
     }
 
@@ -106,7 +106,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
     if (mEmoteMoved)
     {
         // Draw the emote image being dragged by the cursor.
-        const AnimatedSprite* sprite = mEmoteImg[mEmoteMoved - 1];
+        const ImageSprite* sprite = mEmoteImg[mEmoteMoved - 1];
         if (sprite)
         {
             const int tPosX = mCursorPosX - (sprite->getWidth() / 2);
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index e90612b4..c3fb9d14 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -25,8 +25,7 @@
 
 #include <vector>
 
-class AnimatedSprite;
-class Image;
+class ImageSprite;
 
 /**
  * An emote shortcut container. Used to quickly use emoticons.
@@ -67,7 +66,7 @@ class EmoteShortcutContainer : public ShortcutContainer
         void mouseReleased(gcn::MouseEvent &event);
 
     private:
-        std::vector<const AnimatedSprite*> mEmoteImg;
+        std::vector<const ImageSprite*> mEmoteImg;
 
         bool mEmoteClicked;
         int mEmoteMoved;
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index fb5105b2..2e9b698d 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -32,7 +32,6 @@
 #include "gui/outfitwindow.h"
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
-#include "gui/theme.h"
 #include "gui/viewport.h"
 
 #include "net/net.h"
@@ -40,6 +39,7 @@
 
 #include "resources/image.h"
 #include "resources/iteminfo.h"
+#include "resources/theme.h"
 
 #include "utils/stringutils.h"
 
@@ -263,7 +263,7 @@ void ItemContainer::mousePressed(gcn::MouseEvent &event)
             mSelectionStatus = SEL_SELECTING;
             itemShortcut->setItemSelected(item->getId());
 
-            if (item->isEquipment())
+            if (item->getInfo().getEquippable())
                 outfitWindow->setItemSelected(item->getId());
         }
         else
@@ -305,7 +305,14 @@ void ItemContainer::mouseReleased(gcn::MouseEvent &event)
         return;
     if (index == mSelectedIndex || mSelectedIndex == -1)
         return;
-    Net::getInventoryHandler()->moveItem(mSelectedIndex, index);
+
+    Item *item = getSelectedItem();
+    {
+        Mana::Event event(EVENT_DOMOVE);
+        event.setItem("item", item);
+        event.setInt("newIndex", index);
+        event.trigger(CHANNEL_ITEM);
+    }
     selectNone();
 }
 
@@ -372,8 +379,11 @@ void ItemContainer::keyAction()
         mSelectedIndex != -1 &&
         mHighlightedIndex != -1)
     {
-        Net::getInventoryHandler()->moveItem(
-            mSelectedIndex, mHighlightedIndex);
+        Item *item = getSelectedItem();
+        Mana::Event event(EVENT_DOMOVE);
+        event.setItem("item", item);
+        event.setInt("newIndex", mHighlightedIndex);
+        event.trigger(CHANNEL_ITEM);
         setSelectedIndex(mHighlightedIndex);
     }
     // If the highlight is on an item then select it.
@@ -385,8 +395,11 @@ void ItemContainer::keyAction()
     // If the highlight is on a blank space then move it.
     else if (mSelectedIndex != -1)
     {
-        Net::getInventoryHandler()->moveItem(
-            mSelectedIndex, mHighlightedIndex);
+        Item *item = getSelectedItem();
+        Mana::Event event(EVENT_DOMOVE);
+        event.setItem("item", item);
+        event.setInt("newIndex", mHighlightedIndex);
+        event.trigger(CHANNEL_ITEM);
         selectNone();
     }
 }
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index b7341084..8477225f 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -49,7 +49,7 @@ void ItemLinkHandler::handleLink(const std::string &link)
 
     if (id > 0)
     {
-        const ItemInfo &itemInfo = ItemDB::get(id);
+        const ItemInfo &itemInfo = itemDb->get(id);
         mItemPopup->setItem(itemInfo, true);
 
         if (mItemPopup->isVisible())
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 682d71e5..fb4f558f 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -27,16 +27,16 @@
 #include "item.h"
 #include "itemshortcut.h"
 #include "keyboardconfig.h"
-#include "localplayer.h"
+#include "playerinfo.h"
 
 #include "gui/inventorywindow.h"
 #include "gui/itempopup.h"
 #include "gui/palette.h"
-#include "gui/theme.h"
 #include "gui/viewport.h"
 
 #include "resources/image.h"
 #include "resources/iteminfo.h"
+#include "resources/theme.h"
 
 #include "utils/stringutils.h"
 
@@ -53,7 +53,7 @@ ItemShortcutContainer::ItemShortcutContainer():
     mBackgroundImg = Theme::getImageFromTheme("item_shortcut_bgr.png");
     mMaxItems = itemShortcut->getItemCount();
 
-    mBackgroundImg->setAlpha(config.getValue("guialpha", 0.8));
+    mBackgroundImg->setAlpha(config.getFloatValue("guialpha"));
 
     mBoxHeight = mBackgroundImg->getHeight();
     mBoxWidth = mBackgroundImg->getWidth();
@@ -67,9 +67,9 @@ ItemShortcutContainer::~ItemShortcutContainer()
 
 void ItemShortcutContainer::draw(gcn::Graphics *graphics)
 {
-    if (config.getValue("guialpha", 0.8) != mAlpha)
+    if (config.getFloatValue("guialpha") != mAlpha)
     {
-        mAlpha = config.getValue("guialpha", 0.8);
+        mAlpha = config.getFloatValue("guialpha");
         mBackgroundImg->setAlpha(mAlpha);
     }
 
@@ -94,7 +94,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
             continue;
 
         Item *item =
-            player_node->getInventory()->findItem(itemShortcut->getItem(i));
+                PlayerInfo::getInventory()->findItem(itemShortcut->getItem(i));
 
         if (item)
         {
@@ -152,7 +152,7 @@ void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
             if (itemId < 0)
                 return;
 
-            Item *item = player_node->getInventory()->findItem(itemId);
+            Item *item = PlayerInfo::getInventory()->findItem(itemId);
 
             if (item)
             {
@@ -188,7 +188,7 @@ void ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
     }
     else if (event.getButton() == gcn::MouseEvent::RIGHT)
     {
-        Item *item = player_node->getInventory()->
+        Item *item = PlayerInfo::getInventory()->
                      findItem(itemShortcut->getItem(index));
 
         if (!item)
@@ -241,7 +241,7 @@ void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event)
     if (itemId < 0)
         return;
 
-    Item *item = player_node->getInventory()->findItem(itemId);
+    Item *item = PlayerInfo::getInventory()->findItem(itemId);
 
     if (item)
     {
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 4c607edf..939e9fc0 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -20,19 +20,20 @@
 
 #include "gui/widgets/label.h"
 
-#include "gui/theme.h"
+#include "resources/theme.h"
 
 Label::Label()
 {
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 Label::Label(const std::string &caption) :
     gcn::Label(caption)
 {
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 void Label::draw(gcn::Graphics *graphics)
 {
-    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
     gcn::Label::draw(static_cast<gcn::Graphics*>(graphics));
 }
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index ef591023..d79d8d0c 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -25,7 +25,8 @@
 
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
-#include "gui/theme.h"
+
+#include "resources/theme.h"
 
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
@@ -45,8 +46,8 @@ ListBox::~ListBox()
 
 void ListBox::updateAlpha()
 {
-    float alpha = std::max(config.getValue("guialpha", 0.8),
-                   (double) Theme::instance()->getMinimumOpacity());
+    float alpha = std::max(config.getFloatValue("guialpha"),
+                           Theme::instance()->getMinimumOpacity());
 
     if (mAlpha != alpha)
         mAlpha = alpha;
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index 57cbec6f..559ac5a6 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -22,13 +22,12 @@
 #include "gui/widgets/playerbox.h"
 
 #include "animatedsprite.h"
+#include "being.h"
 #include "configuration.h"
 #include "graphics.h"
-#include "player.h"
-
-#include "gui/theme.h"
 
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 
@@ -36,8 +35,8 @@ int PlayerBox::instances = 0;
 float PlayerBox::mAlpha = 1.0;
 ImageRect PlayerBox::background;
 
-PlayerBox::PlayerBox(const Player *player):
-    mPlayer(player)
+PlayerBox::PlayerBox(const Being *being):
+    mBeing(being)
 {
     setFrameSize(2);
 
@@ -57,7 +56,7 @@ PlayerBox::PlayerBox(const Player *player):
                         bggridx[x], bggridy[y],
                         bggridx[x + 1] - bggridx[x] + 1,
                         bggridy[y + 1] - bggridy[y] + 1);
-                background.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
+                background.grid[a]->setAlpha(config.getFloatValue("guialpha"));
                 a++;
             }
         }
@@ -72,7 +71,7 @@ PlayerBox::~PlayerBox()
 {
     instances--;
 
-    mPlayer = 0;
+    mBeing = 0;
 
     if (instances == 0)
     {
@@ -82,20 +81,20 @@ PlayerBox::~PlayerBox()
 
 void PlayerBox::draw(gcn::Graphics *graphics)
 {
-    if (mPlayer)
+    if (mBeing)
     {
         // Draw character
         const int bs = getFrameSize();
-        const int x = getWidth() / 2 + bs;
-        const int y = getHeight() - bs;
-        mPlayer->drawSpriteAt(static_cast<Graphics*>(graphics), x, y);
+        const int x = getWidth() / 2 + bs - 16;
+        const int y = getHeight() - bs - 32;
+        mBeing->drawSpriteAt(static_cast<Graphics*>(graphics), x, y);
     }
 
-    if (config.getValue("guialpha", 0.8) != mAlpha)
+    if (config.getFloatValue("guialpha") != mAlpha)
     {
         for (int a = 0; a < 9; a++)
         {
-            background.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
+            background.grid[a]->setAlpha(config.getFloatValue("guialpha"));
         }
     }
 }
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 33b4a628..4ce6782d 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -24,8 +24,8 @@
 
 #include <guichan/widgets/scrollarea.hpp>
 
+class Being;
 class ImageRect;
-class Player;
 
 /**
  * A box showing a player character.
@@ -39,7 +39,7 @@ class PlayerBox : public gcn::ScrollArea
          * Constructor. Takes the initial player character that this box should
          * display, which defaults to <code>NULL</code>.
          */
-        PlayerBox(const Player *player = 0);
+        PlayerBox(const Being *being = 0);
 
         /**
          * Destructor.
@@ -51,7 +51,8 @@ class PlayerBox : public gcn::ScrollArea
          * player to <code>NULL</code> causes the box not to draw any
          * character.
          */
-        void setPlayer(const Player *player) { mPlayer = player; }
+        void setPlayer(const Being *being)
+        { mBeing = being; }
 
         /**
          * Draws the scroll area.
@@ -64,7 +65,7 @@ class PlayerBox : public gcn::ScrollArea
         void drawFrame(gcn::Graphics *graphics);
 
     private:
-        const Player *mPlayer;       /**< The character used for display */
+        const Being *mBeing; /**< The character used for display */
 
         static float mAlpha;
         static int instances;
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 4dc58f72..e242bcf4 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -26,12 +26,12 @@
 #include "graphics.h"
 #include "log.h"
 
-#include "gui/theme.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/windowcontainer.h"
 
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include <guichan/exception.hpp>
 
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 028658ab..15838952 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -27,9 +27,9 @@
 
 #include "gui/gui.h"
 #include "gui/palette.h"
-#include "gui/theme.h"
 
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 
@@ -123,8 +123,8 @@ void ProgressBar::logic()
 
 void ProgressBar::updateAlpha()
 {
-    float alpha = std::max(config.getValue("guialpha", 0.8),
-                   (double) Theme::instance()->getMinimumOpacity());
+    float alpha = std::max(config.getFloatValue("guialpha"),
+                           Theme::instance()->getMinimumOpacity());
 
     if (mAlpha != alpha)
     {
diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp
index 6bda617f..91b40751 100644
--- a/src/gui/widgets/progressindicator.cpp
+++ b/src/gui/widgets/progressindicator.cpp
@@ -23,11 +23,10 @@
 #include "graphics.h"
 #include "simpleanimation.h"
 
-#include "gui/theme.h"
-
 #include "resources/animation.h"
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
+#include "resources/theme.h"
 
 #include <guichan/widgets/label.hpp>
 
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index 96797225..1296feb6 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -24,9 +24,8 @@
 #include "configuration.h"
 #include "graphics.h"
 
-#include "gui/theme.h"
-
 #include "resources/image.h"
+#include "resources/theme.h"
 
 int RadioButton::instances = 0;
 float RadioButton::mAlpha = 1.0;
@@ -78,9 +77,9 @@ RadioButton::~RadioButton()
 
 void RadioButton::drawBox(gcn::Graphics* graphics)
 {
-    if (config.getValue("guialpha", 0.8) != mAlpha)
+    if (config.getFloatValue("guialpha") != mAlpha)
     {
-        mAlpha = config.getValue("guialpha", 0.8);
+        mAlpha = config.getFloatValue("guialpha");
         radioNormal->setAlpha(mAlpha);
         radioChecked->setAlpha(mAlpha);
         radioDisabled->setAlpha(mAlpha);
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index f0c3691c..7850643f 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -24,9 +24,8 @@
 #include "configuration.h"
 #include "graphics.h"
 
-#include "gui/theme.h"
-
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include <guichan/graphics.hpp>
 
@@ -59,9 +58,9 @@ ResizeGrip::~ResizeGrip()
 
 void ResizeGrip::draw(gcn::Graphics *graphics)
 {
-    if (config.getValue("guialpha", 0.8) != mAlpha)
+    if (config.getFloatValue("guialpha") != mAlpha)
     {
-        mAlpha = config.getValue("guialpha", 0.8);
+        mAlpha = config.getFloatValue("guialpha");
         gripImage->setAlpha(mAlpha);
     }
 
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 0c7f4d7d..7d42883a 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -24,9 +24,8 @@
 #include "configuration.h"
 #include "graphics.h"
 
-#include "gui/theme.h"
-
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 
@@ -108,7 +107,7 @@ void ScrollArea::init()
                         bggridx[x], bggridy[y],
                         bggridx[x + 1] - bggridx[x] + 1,
                         bggridy[y + 1] - bggridy[y] + 1);
-                background.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
+                background.grid[a]->setAlpha(config.getFloatValue("guialpha"));
                 a++;
             }
         }
@@ -135,8 +134,8 @@ void ScrollArea::init()
                         vsgridx[x], vsgridy[y],
                         vsgridx[x + 1] - vsgridx[x],
                         vsgridy[y + 1] - vsgridy[y]);
-                vMarker.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
-                vMarkerHi.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
+                vMarker.grid[a]->setAlpha(config.getFloatValue("guialpha"));
+                vMarkerHi.grid[a]->setAlpha(config.getFloatValue("guialpha"));
                 a++;
             }
         }
@@ -213,8 +212,8 @@ void ScrollArea::logic()
 
 void ScrollArea::updateAlpha()
 {
-        float alpha = std::max(config.getValue("guialpha", 0.8),
-                   (double) Theme::instance()->getMinimumOpacity());
+        float alpha = std::max(config.getFloatValue("guialpha"),
+                               Theme::instance()->getMinimumOpacity());
 
     if (alpha != mAlpha)
     {
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index a5033570..ae7d4d9b 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -26,12 +26,12 @@
 #include "shopitem.h"
 
 #include "gui/itempopup.h"
-#include "gui/theme.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/shopitems.h"
 
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include <guichan/font.hpp>
 #include <guichan/listmodel.hpp>
@@ -76,8 +76,8 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
     if (!mListModel)
         return;
 
-    if (config.getValue("guialpha", 0.8) != mAlpha)
-        mAlpha = config.getValue("guialpha", 0.8);
+    if (config.getFloatValue("guialpha") != mAlpha)
+        mAlpha = config.getFloatValue("guialpha");
 
     int alpha = (int)(mAlpha * 255.0f);
     const gcn::Color* highlightColor =
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 6a9a5c7c..c044d55d 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -24,9 +24,8 @@
 #include "configuration.h"
 #include "graphics.h"
 
-#include "gui/theme.h"
-
 #include "resources/image.h"
+#include "resources/theme.h"
 
 Image *Slider::hStart, *Slider::hMid, *Slider::hEnd, *Slider::hGrip;
 Image *Slider::vStart, *Slider::vMid, *Slider::vEnd, *Slider::vGrip;
@@ -126,8 +125,8 @@ void Slider::init()
 
 void Slider::updateAlpha()
 {
-    float alpha = std::max(config.getValue("guialpha", 0.8),
-                   (double) Theme::instance()->getMinimumOpacity());
+    float alpha = std::max(config.getFloatValue("guialpha"),
+                           Theme::instance()->getMinimumOpacity());
 
     if (alpha != mAlpha)
     {
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 2ab126dd..10a51afe 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -25,11 +25,11 @@
 #include "graphics.h"
 
 #include "gui/palette.h"
-#include "gui/theme.h"
 
 #include "gui/widgets/tabbedarea.h"
 
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 
@@ -118,8 +118,8 @@ void Tab::init()
 
 void Tab::updateAlpha()
 {
-    float alpha = std::max(config.getValue("guialpha", 0.8),
-                   (double) Theme::instance()->getMinimumOpacity());
+    float alpha = std::max(config.getFloatValue("guialpha"),
+                           Theme::instance()->getMinimumOpacity());
 
     // TODO We don't need to do this for every tab on every draw
     // Maybe use a config listener to do it as the value changes.
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 101c9546..412d3ddc 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -25,11 +25,20 @@
 
 #include <guichan/widgets/container.hpp>
 
-TabbedArea::TabbedArea() : gcn::TabbedArea()
+TabbedArea::TabbedArea() : gcn::TabbedArea(),
+                           mTabsWidth(0),
+                           mVisibleTabsWidth(0),
+                           mTabScrollIndex(0)
 {
     mWidgetContainer->setOpaque(false);
     addWidgetListener(this);
 
+    mArrowButton[0] = new Button("<", "shift_left", this);
+    mArrowButton[1] = new Button(">", "shift_right", this);
+
+    add(mArrowButton[0]);
+    add(mArrowButton[1]);
+
     widgetResized(NULL);
 }
 
@@ -90,6 +99,9 @@ void TabbedArea::addTab(gcn::Tab* tab, gcn::Widget* widget)
     int width = getWidth() - 2 * getFrameSize();
     int height = getHeight() - 2 * getFrameSize() - mTabContainer->getHeight();
     widget->setSize(width, height);
+
+    updateTabsWidth();
+    updateArrowEnableState();
 }
 
 void TabbedArea::addTab(const std::string &caption, gcn::Widget *widget)
@@ -134,6 +146,7 @@ void TabbedArea::removeTab(Tab *tab)
     }
 
     adjustSize();
+    updateTabsWidth();
     adjustTabPositions();
 }
 
@@ -184,4 +197,136 @@ void TabbedArea::widgetResized(const gcn::Event &event)
     gcn::Widget *w = getCurrentWidget();
     if (w)
         w->setSize(width, height);
+
+    // Check whether there is room to show more tabs now.
+    int innerWidth = getWidth() - 4 - mArrowButton[0]->getWidth()
+        - mArrowButton[1]->getWidth();
+    int newWidth = mVisibleTabsWidth;
+    while (mTabScrollIndex && newWidth < innerWidth)
+    {
+        newWidth += mTabs[mTabScrollIndex - 1].first->getWidth();
+        if (newWidth < innerWidth)
+            --mTabScrollIndex;
+    }
+
+    // Move the right arrow to fit the windows content.
+    mArrowButton[1]->setPosition(width - mArrowButton[1]->getWidth(), 0);
+
+    updateArrowEnableState();
+    adjustTabPositions();
+}
+
+void TabbedArea::updateTabsWidth()
+{
+    mTabsWidth = 0;
+    for (TabContainer::const_iterator itr = mTabs.begin(), itr_end = mTabs.end();
+         itr != itr_end; ++itr)
+    {
+        mTabsWidth += (*itr).first->getWidth();
+    }
+    updateVisibleTabsWidth();
+}
+
+void TabbedArea::updateVisibleTabsWidth()
+{
+    mVisibleTabsWidth = 0;
+    for (unsigned int i = mTabScrollIndex; i < mTabs.size(); ++i)
+    {
+        mVisibleTabsWidth += mTabs[i].first->getWidth();
+    }
+}
+
+void TabbedArea::adjustTabPositions()
+{
+    int maxTabHeight = 0;
+    for (unsigned i = 0; i < mTabs.size(); ++i)
+    {
+        if (mTabs[i].first->getHeight() > maxTabHeight)
+        {
+            maxTabHeight = mTabs[i].first->getHeight();
+        }
+    }
+
+    int x = mArrowButton[0]->isVisible() ? mArrowButton[0]->getWidth() : 0;
+    for (unsigned i = mTabScrollIndex; i < mTabs.size(); ++i)
+    {
+        gcn::Tab* tab = mTabs[i].first;
+        tab->setPosition(x, maxTabHeight - tab->getHeight());
+        x += tab->getWidth();
+    }
+
+    // If the tabs are scrolled, we hide them away.
+    if (mTabScrollIndex > 0)
+    {
+        x = 0;
+        for (unsigned i = 0; i < mTabScrollIndex; ++i)
+        {
+            gcn::Tab* tab = mTabs[i].first;
+            x -= tab->getWidth();
+            tab->setPosition(x, maxTabHeight - tab->getHeight());
+        }
+    }
+}
+
+void TabbedArea::action(const gcn::ActionEvent& actionEvent)
+{
+    Widget* source = actionEvent.getSource();
+    Tab* tab = dynamic_cast<Tab*>(source);
+
+    if (tab)
+    {
+        setSelectedTab(tab);
+    }
+    else
+    {
+        if (actionEvent.getId() == "shift_left")
+        {
+            if (mTabScrollIndex)
+                --mTabScrollIndex;
+        }
+        else if (actionEvent.getId() == "shift_right")
+        {
+            if (mTabScrollIndex < mTabs.size() - 1)
+                ++mTabScrollIndex;
+        }
+        adjustTabPositions();
+
+        updateArrowEnableState();
+    }
+}
+
+void TabbedArea::updateArrowEnableState()
+{
+    updateTabsWidth();
+    if (mTabsWidth > getWidth() - 4
+        - mArrowButton[0]->getWidth()
+        - mArrowButton[1]->getWidth())
+    {
+        mArrowButton[0]->setVisible(true);
+        mArrowButton[1]->setVisible(true);
+    }
+    else
+    {
+        mArrowButton[0]->setVisible(false);
+        mArrowButton[1]->setVisible(false);
+        mTabScrollIndex = 0;
+    }
+
+    // Left arrow consistency check
+    if (!mTabScrollIndex)
+        mArrowButton[0]->setEnabled(false);
+    else
+        mArrowButton[0]->setEnabled(true);
+
+    // Right arrow consistency check
+    if (mVisibleTabsWidth < getWidth() - 4
+        - mArrowButton[0]->getWidth()
+        - mArrowButton[1]->getWidth())
+    {
+        mArrowButton[1]->setEnabled(false);
+    }
+    else
+    {
+        mArrowButton[1]->setEnabled(true);
+    }
 }
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 925da2de..19393f8b 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -27,6 +27,8 @@
 #include <guichan/widgets/container.hpp>
 #include <guichan/widgets/tabbedarea.hpp>
 
+#include "gui/widgets/button.h"
+
 #include <string>
 
 class Tab;
@@ -107,11 +109,52 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener
 
         void widgetResized(const gcn::Event &event);
 
+        void adjustTabPositions();
+
+        void action(const gcn::ActionEvent& actionEvent);
+
         // Inherited from MouseListener
 
         void mousePressed(gcn::MouseEvent &mouseEvent);
     private:
         typedef std::vector< std::pair<gcn::Tab*, gcn::Widget*> > TabContainer;
+
+        /** The tab arrows */
+        gcn::Button *mArrowButton[2];
+
+        /** Check whether the arrow should be clickable */
+        void updateArrowEnableState();
+
+        /**
+         * Update the overall width of all tab. Used to know whether the arrows
+         * have to be drawn or not.
+         */
+        void updateTabsWidth();
+
+        /**
+         * The overall width of all tab.
+         */
+        int mTabsWidth;
+
+        /**
+         * Update the overall width of visible tab. Used to know whether
+         * the arrows have to be enable or not.
+         */
+        void updateVisibleTabsWidth();
+
+        /**
+         * The overall width of visible tab.
+         */
+        int mVisibleTabsWidth;
+
+
+        /**
+         * The tab scroll index. When scrolling with the arrows, the tabs
+         * must be displayed according to the current index.
+         * So the first tab displayed may not be the first in the list.
+         * @note the index must start at 0.
+         */
+        unsigned mTabScrollIndex;
 };
 
 #endif
diff --git a/src/gui/widgets/table.cpp b/src/gui/widgets/table.cpp
index f0887ed7..3d8680ce 100644
--- a/src/gui/widgets/table.cpp
+++ b/src/gui/widgets/table.cpp
@@ -24,7 +24,8 @@
 #include "configuration.h"
 
 #include "gui/sdlinput.h"
-#include "gui/theme.h"
+
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 
@@ -270,8 +271,8 @@ void GuiTable::draw(gcn::Graphics* graphics)
     if (!mModel)
         return;
 
-    if (config.getValue("guialpha", 0.8) != mAlpha)
-        mAlpha = config.getValue("guialpha", 0.8);
+    if (config.getFloatValue("guialpha") != mAlpha)
+        mAlpha = config.getFloatValue("guialpha");
 
     if (mOpaque)
     {
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index f248f35d..5b112e54 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/widgets/textbox.h"
 
-#include "gui/theme.h"
+#include "resources/theme.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 4989ae83..d06df376 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -21,15 +21,14 @@
 
 #include "gui/widgets/textfield.h"
 
-#include "beingmanager.h"
 #include "configuration.h"
 #include "graphics.h"
 
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
-#include "gui/theme.h"
 
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include "utils/copynpaste.h"
 #include "utils/dtor.h"
@@ -69,7 +68,7 @@ TextField::TextField(const std::string &text, bool loseFocusOnTab):
                         gridx[x], gridy[y],
                         gridx[x + 1] - gridx[x] + 1,
                         gridy[y + 1] - gridy[y] + 1);
-                skin.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
+                skin.grid[a]->setAlpha(config.getFloatValue("guialpha"));
                 a++;
             }
         }
@@ -90,8 +89,8 @@ TextField::~TextField()
 
 void TextField::updateAlpha()
 {
-    float alpha = std::max(config.getValue("guialpha", 0.8),
-                   (double) Theme::instance()->getMinimumOpacity());
+    float alpha = std::max(config.getFloatValue("guialpha"),
+                           Theme::instance()->getMinimumOpacity());
 
     if (alpha != mAlpha)
     {
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index 10426d7c..869ebd35 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -45,8 +45,8 @@ TextPreview::TextPreview(const std::string &text):
 
 void TextPreview::draw(gcn::Graphics* graphics)
 {
-    if (config.getValue("guialpha", 0.8) != mAlpha)
-        mAlpha = config.getValue("guialpha", 0.8);
+    if (config.getFloatValue("guialpha") != mAlpha)
+        mAlpha = config.getFloatValue("guialpha");
 
     int alpha = (int) (mAlpha * 255.0f);
 
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index 7542e251..864f1f51 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -21,14 +21,15 @@
 
 #include "whispertab.h"
 
+#include "chatlog.h"
 #include "commandhandler.h"
 #include "localplayer.h"
 
-#include "gui/theme.h"
-
 #include "net/chathandler.h"
 #include "net/net.h"
 
+#include "resources/theme.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
@@ -115,3 +116,9 @@ bool WhisperTab::handleCommand(const std::string &type,
 
     return true;
 }
+
+void WhisperTab::saveToLogFile(std::string &msg)
+{
+    if (chatLogger)
+        chatLogger->log(getNick(), msg);
+}
diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h
index 447a8fe0..20a07449 100644
--- a/src/gui/widgets/whispertab.h
+++ b/src/gui/widgets/whispertab.h
@@ -39,6 +39,8 @@ class WhisperTab : public ChatTab
         bool handleCommand(const std::string &type,
                            const std::string &args);
 
+        void saveToLogFile(std::string &msg);
+
     protected:
         friend class ChatWindow;
 
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 118ee7c0..aa8e6df3 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -26,7 +26,6 @@
 
 #include "gui/gui.h"
 #include "gui/palette.h"
-#include "gui/theme.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/layout.h"
@@ -34,6 +33,7 @@
 #include "gui/widgets/windowcontainer.h"
 
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include <guichan/exception.hpp>
 #include <guichan/focushandler.hpp>
@@ -697,8 +697,8 @@ int Window::getResizeHandles(gcn::MouseEvent &event)
 
 int Window::getGuiAlpha()
 {
-    float alpha = std::max(config.getValue("guialpha", 0.8),
-                   (double) Theme::instance()->getMinimumOpacity());
+    float alpha = std::max(config.getFloatValue("guialpha"),
+                           Theme::instance()->getMinimumOpacity());
     return (int) (alpha * 255.0f);
 }
 
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 4b18de89..542ab4a0 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -58,7 +58,7 @@ WindowMenu::WindowMenu():
     if (skillDialog->hasSkills())
         addButton(N_("Skills"), x, h);
 
-    if (specialsWindow->hasSpecials())
+    // if (specialsWindow->hasSpecials())
         addButton(N_("Specials"), x, h);
 
     addButton(N_("Social"), x, h);
diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp
index 3219b83d..3207f394 100644
--- a/src/gui/worldselectdialog.cpp
+++ b/src/gui/worldselectdialog.cpp
@@ -137,3 +137,13 @@ void WorldSelectDialog::keyPressed(gcn::KeyEvent &keyEvent)
         action(gcn::ActionEvent(NULL, mChooseWorld->getActionEventId()));
     }
 }
+
+void WorldSelectDialog::mouseClicked(gcn::MouseEvent &mouseEvent)
+{
+    if (mouseEvent.getSource() == mWorldList &&
+        isDoubleClick(mWorldList->getSelected()))
+    {
+        action(gcn::ActionEvent(mChooseWorld,
+                                mChooseWorld->getActionEventId()));
+    }
+}
diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h
index 2d4f0189..b51110b4 100644
--- a/src/gui/worldselectdialog.h
+++ b/src/gui/worldselectdialog.h
@@ -62,6 +62,8 @@ class WorldSelectDialog : public Window, public gcn::ActionListener,
 
         void keyPressed(gcn::KeyEvent &keyEvent);
 
+        void mouseClicked(gcn::MouseEvent &mouseEvent);
+
     private:
         WorldListModel *mWorldListModel;
         gcn::ListBox *mWorldList;
diff --git a/src/guild.cpp b/src/guild.cpp
index 029cde7f..00d8614e 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -21,8 +21,7 @@
 
 #include "guild.h"
 
-#include "beingmanager.h"
-#include "player.h"
+#include "actorspritemanager.h"
 
 GuildMember::GuildMember(Guild *guild, int id, const std::string &name):
         Avatar(name), mId(id), mGuild(guild)
@@ -150,10 +149,8 @@ void Guild::removeFromMembers()
                                itr_end = mMembers.end();
     while(itr != itr_end)
     {
-        Being *b = beingManager->findBeing((*itr)->getID());
-
-        if (b->getType() == Being::PLAYER)
-            static_cast<Player*>(b)->removeGuild(getId());
+        Being *b = actorSpriteManager->findBeing((*itr)->getID());
+        b->removeGuild(getId());
         ++itr;
     }
 }
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
index 8ef2cce9..b7d92277 100644
--- a/src/imageparticle.cpp
+++ b/src/imageparticle.cpp
@@ -39,23 +39,21 @@ ImageParticle::~ImageParticle()
         mImage->decRef();
 }
 
-void ImageParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
+bool ImageParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
 {
-    if (!mAlive || !mImage)
-        return;
+    if (!isAlive() || !mImage)
+        return false;
 
     int screenX = (int) mPos.x + offsetX - mImage->getWidth() / 2;
     int screenY = (int) mPos.y - (int)mPos.z + offsetY - mImage->getHeight()/2;
 
     // Check if on screen
-    if (screenX + mImage->getWidth() < 0 ||
-            screenX > graphics->getWidth() ||
-            screenY + mImage->getHeight() < 0 ||
-            screenY > graphics->getHeight())
-    {
-        return;
-    }
+    if (screenX + mImage->getWidth() < 0
+        || screenX > graphics->getWidth()
+        || screenY + mImage->getHeight() < 0
+        || screenY > graphics->getHeight())
+        return false;
 
     mImage->setAlpha(getCurrentAlpha());
-    graphics->drawImage(mImage, screenX, screenY);
+    return graphics->drawImage(mImage, screenX, screenY);
 }
diff --git a/src/imageparticle.h b/src/imageparticle.h
index bc32400d..23909fa3 100644
--- a/src/imageparticle.h
+++ b/src/imageparticle.h
@@ -49,7 +49,7 @@ class ImageParticle : public Particle
         /**
          * Draws the particle image
          */
-        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const;
+        virtual bool draw(Graphics *graphics, int offsetX, int offsetY) const;
 
     protected:
         Image *mImage;   /**< The image used for this particle. */
diff --git a/src/imagesprite.cpp b/src/imagesprite.cpp
new file mode 100644
index 00000000..504aba96
--- /dev/null
+++ b/src/imagesprite.cpp
@@ -0,0 +1,44 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "imagesprite.h"
+
+#include "graphics.h"
+
+ImageSprite::ImageSprite(Image *image):
+        mImage(image)
+{
+    mAlpha = mImage->getAlpha();
+
+    mImage->incRef();
+}
+
+ImageSprite::~ImageSprite()
+{
+    mImage->decRef();
+}
+
+bool ImageSprite::draw(Graphics* graphics, int posX, int posY) const
+{
+    if (mImage->getAlpha() != mAlpha)
+        mImage->setAlpha(mAlpha);
+
+    return graphics->drawImage(mImage, posX, posY);
+}
diff --git a/src/imagesprite.h b/src/imagesprite.h
new file mode 100644
index 00000000..3a3678d9
--- /dev/null
+++ b/src/imagesprite.h
@@ -0,0 +1,73 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef IMAGESPRITE_H
+#define IMAGESPRITE_H
+
+#include "sprite.h"
+
+#include "resources/image.h"
+
+class Graphics;
+
+class ImageSprite : public Sprite
+{
+public:
+    ImageSprite(Image *image);
+
+    ~ImageSprite();
+
+    bool reset()
+    { return false; }
+
+    bool play(std::string action)
+    { return false; }
+
+    bool update(int time)
+    { return false; }
+
+    bool draw(Graphics* graphics, int posX, int posY) const;
+
+    int getWidth() const
+    { return mImage->getWidth(); }
+
+    int getHeight() const
+    { return mImage->getHeight(); }
+
+    const Image* getImage() const
+    { return mImage; }
+
+    virtual bool setDirection(SpriteDirection direction)
+    { return false; }
+
+    int getNumberOfLayers()
+    { return 1; }
+
+    size_t getCurrentFrame() const
+    { return 0; }
+
+    size_t getFrameCount() const
+    { return 1; }
+
+private:
+    Image *mImage;
+};
+
+#endif // IMAGESPRITE_H
diff --git a/src/inventory.cpp b/src/inventory.cpp
index a6038c85..3c556f01 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -36,7 +36,7 @@ struct SlotUsed : public std::unary_function<Item*, bool>
     }
 };
 
-Inventory::Inventory(int type, int size):
+Inventory::Inventory(Type type, int size):
     mType(type),
     mSize(size == -1 ? Net::getInventoryHandler()->getSize(type) : size),
     mUsed(0)
@@ -70,12 +70,12 @@ Item *Inventory::findItem(int itemId) const
     return NULL;
 }
 
-void Inventory::addItem(int id, int quantity, bool equipment)
+void Inventory::addItem(int id, int quantity)
 {
-    setItem(getFreeSlot(), id, quantity, equipment);
+    setItem(getFreeSlot(), id, quantity);
 }
 
-void Inventory::setItem(int index, int id, int quantity, bool equipment)
+void Inventory::setItem(int index, int id, int quantity)
 {
     if (index < 0 || index >= mSize)
     {
@@ -85,7 +85,7 @@ void Inventory::setItem(int index, int id, int quantity, bool equipment)
 
     if (!mItems[index] && id > 0)
     {
-        Item *item = new Item(id, quantity, equipment);
+        Item *item = new Item(id, quantity);
         item->setInvIndex(index);
         mItems[index] = item;
         mUsed++;
@@ -95,7 +95,6 @@ void Inventory::setItem(int index, int id, int quantity, bool equipment)
     {
         mItems[index]->setId(id);
         mItems[index]->setQuantity(quantity);
-        mItems[index]->setEquipment(equipment);
     }
     else if (mItems[index])
     {
diff --git a/src/inventory.h b/src/inventory.h
index 0ee516d6..7af9f160 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -43,7 +43,7 @@ class Inventory
     public:
         static const int NO_SLOT_INDEX = -1; /**< Slot has no index. */
 
-        enum {
+        enum Type {
             INVENTORY,
             STORAGE,
             TRADE,
@@ -56,7 +56,7 @@ class Inventory
          *
          * @param size the number of items that fit in the inventory
          */
-        Inventory(int type, int size = -1);
+        Inventory(Type type, int size = -1);
 
         /**
          * Destructor.
@@ -84,12 +84,12 @@ class Inventory
         /**
          * Adds a new item in a free slot.
          */
-        void addItem(int id, int quantity, bool equipment = false);
+        void addItem(int id, int quantity);
 
         /**
          * Sets the item at the given position.
          */
-        void setItem(int index, int id, int quantity, bool equipment = false);
+        void setItem(int index, int id, int quantity);
 
         /**
          * Remove a item from the inventory.
@@ -143,7 +143,7 @@ class Inventory
 
         void distributeSlotsChangedEvent();
 
-        int mType;
+        Type mType;
         Item **mItems;  /**< The holder of items */
         int mSize;      /**< The max number of inventory items */
         int mUsed;      /**< THe number of slots in use */
diff --git a/src/item.cpp b/src/item.cpp
index b434387e..fee7e86f 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -21,18 +21,19 @@
 
 #include "item.h"
 
-#include "gui/theme.h"
+#include "configuration.h"
+#include "event.h"
 
 #include "resources/image.h"
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
-#include "configuration.h"
+#include "resources/theme.h"
 
-Item::Item(int id, int quantity, bool equipment, bool equipped):
+Item::Item(int id, int quantity, bool equipped):
     mImage(0),
     mDrawImage(0),
     mQuantity(quantity),
-    mEquipment(equipment), mEquipped(equipped), mInEquipment(false)
+    mEquipped(equipped), mInEquipment(false)
 {
     setId(id);
 }
@@ -47,9 +48,6 @@ void Item::setId(int id)
 {
     mId = id;
 
-    // Types 0 and 1 are not equippable items.
-    mEquipment = id && getInfo().getType() >= 2;
-
     // Load the associated image
     if (mImage)
         mImage->decRef();
@@ -58,8 +56,9 @@ void Item::setId(int id)
         mDrawImage->decRef();
 
     ResourceManager *resman = ResourceManager::getInstance();
-    std::string imagePath = paths.getValue("itemIcons", "graphics/items/")
-                            + getInfo().getImageName();
+    SpriteDisplay display = getInfo().getDisplay();
+    std::string imagePath = paths.getStringValue("itemIcons")
+                            + display.image;
     mImage = resman->getImage(imagePath);
     mDrawImage = resman->getImage(imagePath);
 
@@ -72,3 +71,23 @@ void Item::setId(int id)
                                             paths.getValue("unknownItemFile",
                                                            "unknown-item.png"));
 }
+
+void Item::doEvent(Events eventName)
+{
+    Mana::Event event(eventName);
+    event.setItem("item", this);
+    event.trigger(CHANNEL_ITEM);
+}
+
+void Item::doEvent(Events eventName, int amount)
+{
+    Mana::Event event(eventName);
+    event.setItem("item", this);
+    event.setInt("amount", amount);
+    event.trigger(CHANNEL_ITEM);
+}
+
+bool Item::isEquippable() const
+{
+    return getInfo().getEquippable();
+}
diff --git a/src/item.h b/src/item.h
index 17be8f04..24ee2fc5 100644
--- a/src/item.h
+++ b/src/item.h
@@ -22,6 +22,8 @@
 #ifndef ITEM_H
 #define ITEM_H
 
+#include "event.h"
+
 #include "resources/itemdb.h"
 
 class Image;
@@ -35,8 +37,7 @@ class Item
         /**
          * Constructor.
          */
-        Item(int id = -1, int quantity = 0, bool equipment = false,
-             bool equipped = false);
+        Item(int id = -1, int quantity = 0, bool equipped = false);
 
         /**
          * Destructor.
@@ -79,16 +80,6 @@ class Item
         int getQuantity() const { return mQuantity; }
 
         /**
-         * Sets whether this item is considered equipment.
-         */
-        void setEquipment(bool equipment) { mEquipment = equipment; }
-
-        /**
-         * Returns whether this item is considered equipment.
-         */
-        bool isEquipment() const { return mEquipment; }
-
-        /**
          * Sets whether this item is equipped.
          */
         void setEquipped(bool equipped) { mEquipped = equipped; }
@@ -109,6 +100,11 @@ class Item
         bool isInEquipment() const { return mInEquipment; }
 
         /**
+         * Returns whether this item is equippable.
+         */
+        bool isEquippable() const;
+
+        /**
          * Sets the inventory index of this item.
          */
         void setInvIndex(int index) { mInvIndex = index; }
@@ -118,20 +114,24 @@ class Item
          */
         int getInvIndex() const { return mInvIndex; }
 
+        void doEvent(Events eventName);
+
+        void doEvent(Events eventName, int amount);
+
         /**
          * Returns information about this item type.
          */
-        const ItemInfo &getInfo() const { return ItemDB::get(mId); }
+        const ItemInfo &getInfo() const { return itemDb->get(mId); }
 
     protected:
         int mId;              /**< Item type id. */
         Image *mImage;        /**< Item image. */
         Image *mDrawImage;    /**< Draw image. */
         int mQuantity;        /**< Number of items. */
-        bool mEquipment;      /**< Item is equipment. */
         bool mEquipped;       /**< Item is equipped. */
         bool mInEquipment;    /**< Item is in equipment */
         int mInvIndex;        /**< Inventory index. */
+
 };
 
 #endif
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index 88b04347..0e5abef8 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -20,13 +20,15 @@
  */
 
 #include "configuration.h"
+#include "event.h"
 #include "inventory.h"
 #include "item.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
+#include "playerinfo.h"
 
 #include "net/inventoryhandler.h"
-#include "net/net.h"
+
+#include "resources/iteminfo.h"
 
 #include "utils/stringutils.h"
 
@@ -66,19 +68,19 @@ void ItemShortcut::useItem(int index)
 {
     if (mItems[index])
     {
-        Item *item = player_node->getInventory()->findItem(mItems[index]);
+        Item *item = PlayerInfo::getInventory()->findItem(mItems[index]);
         if (item && item->getQuantity())
         {
-            if (item->isEquipment())
+            if (item->getInfo().getEquippable())
             {
                 if (item->isEquipped())
-                    Net::getInventoryHandler()->unequipItem(item);
+                    item->doEvent(EVENT_DOUNEQUIP);
                 else
-                    Net::getInventoryHandler()->equipItem(item);
+                    item->doEvent(EVENT_DOEQUIP);
             }
             else
             {
-                Net::getInventoryHandler()->useItem(item);
+                item->doEvent(EVENT_DOUSE);
             }
         }
     }
diff --git a/src/joystick.cpp b/src/joystick.cpp
index f440c61f..9864a12b 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -61,11 +61,11 @@ Joystick::Joystick(int no):
     logger->log("Hats: %i", SDL_JoystickNumHats(mJoystick));
     logger->log("Buttons: %i", SDL_JoystickNumButtons(mJoystick));
 
-    mEnabled = (int) config.getValue("joystickEnabled", 0) != 0;
-    mUpTolerance = (int) config.getValue("upTolerance", 100);
-    mDownTolerance = (int) config.getValue("downTolerance", 100);
-    mLeftTolerance = (int) config.getValue("leftTolerance", 100);
-    mRightTolerance = (int) config.getValue("rightTolerance", 100);
+    mEnabled = config.getBoolValue("joystickEnabled");
+    mUpTolerance = config.getIntValue("upTolerance");
+    mDownTolerance = config.getIntValue("downTolerance");
+    mLeftTolerance = config.getIntValue("leftTolerance");
+    mRightTolerance = config.getIntValue("rightTolerance");
 }
 
 Joystick::~Joystick()
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 65143d69..ec2bf6ed 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -20,7 +20,6 @@
 
 #include "configuration.h"
 #include "keyboardconfig.h"
-#include "log.h"
 
 #include "gui/sdlinput.h"
 #include "gui/setup_keyboard.h"
diff --git a/src/listener.cpp b/src/listener.cpp
new file mode 100644
index 00000000..f9acac95
--- /dev/null
+++ b/src/listener.cpp
@@ -0,0 +1,43 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "listener.h"
+
+#include "event.h"
+
+namespace Mana
+{
+
+Listener::~Listener()
+{
+    Event::remove(this);
+}
+
+void Listener::listen(Channels channel)
+{
+    Event::bind(this, channel);
+}
+
+void Listener::ignore(Channels channel)
+{
+    Event::unbind(this, channel);
+}
+
+} // namespace Mana
diff --git a/src/net/manaserv/stats.h b/src/listener.h
index 63349095..84b613eb 100644
--- a/src/net/manaserv/stats.h
+++ b/src/listener.h
@@ -18,24 +18,28 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_MANASERV_STATS_H
-#define NET_MANASERV_STATS_H
+#ifndef LISTENER_H
+#define LISTENER_H
+
+#include "event.h"
 
 #include <string>
-#include <vector>
 
-namespace ManaServ {
-namespace Stats {
-    void load();
+namespace Mana
+{
+
+class Listener
+{
+public:
+    virtual ~Listener();
 
-    void unload();
+    void listen(Channels channel);
 
-    void informItemDB();
+    void ignore(Channels channel);
 
-    void informStatusWindow();
+    virtual void event(Channels channel, const Event &event) = 0;
+};
 
-    std::vector<std::string> getLabelVector();
-} // namespace Stats
-} // namespace ManaServ
+} // namespace Mana
 
-#endif // NET_MANASERV_STATS_H
+#endif
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index cea27960..3e59e794 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -23,30 +23,19 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "effectmanager.h"
-#include "equipment.h"
+#include "event.h"
 #include "flooritem.h"
 #include "graphics.h"
 #include "guild.h"
-#include "inventory.h"
 #include "item.h"
-#include "log.h"
 #include "map.h"
-#include "monster.h"
 #include "particle.h"
+#include "playerinfo.h"
 #include "simpleanimation.h"
 #include "sound.h"
-#include "statuseffect.h"
-#include "text.h"
 
 #include "gui/gui.h"
-#include "gui/inventorywindow.h"
-#include "gui/ministatus.h"
 #include "gui/okdialog.h"
-#include "gui/skilldialog.h"
-#include "gui/statuswindow.h"
-#include "gui/theme.h"
-#include "gui/userpalette.h"
 
 #include "gui/widgets/chattab.h"
 
@@ -61,9 +50,8 @@
 
 #include "resources/animation.h"
 #include "resources/imageset.h"
-#include "resources/itemdb.h"
 #include "resources/iteminfo.h"
-#include "resources/resourcemanager.h"
+#include "resources/userpalette.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -80,62 +68,37 @@ const short walkingKeyboardDelay = 1000;
 LocalPlayer *player_node = NULL;
 
 LocalPlayer::LocalPlayer(int id, int subtype):
-    Player(id, subtype, 0),
-    mEquipment(new Equipment),
+    Being(id, PLAYER, subtype, 0),
     mAttackRange(0),
     mTargetTime(-1),
     mLastTarget(-1),
-    mCharacterPoints(0),
-    mCorrectionPoints(0),
-    mSpecialRechargeUpdateNeeded(0),
-    mLevel(1),
-    mExp(0), mExpNeeded(0),
-    mMp(0), mMaxMp(0),
-    mMoney(0),
-    mTotalWeight(1), mMaxWeight(1),
-    mHp(1), mMaxHp(1),
-    mSkillPoints(0),
     mTarget(NULL),
     mPickUpTarget(NULL),
-    mTrading(false), mGoingToTarget(false), mKeepAttacking(false),
+    mGoingToTarget(false), mKeepAttacking(false),
     mLastAction(-1),
     mWalkingDir(0),
     mPathSetByMouse(false),
-    mInventory(new Inventory(Inventory::INVENTORY)),
     mLocalWalkTime(-1),
     mMessageTime(0),
+    mShowIp(false),
     mAwayDialog(0),
     mAfkTime(0),
-    mAwayMode(false),
-    mShowIp(false)
+    mAwayMode(false)
 {
+    listen(CHANNEL_ATTRIBUTES);
+
     mAwayListener = new AwayListener();
 
     mUpdateName = true;
 
-    mTextColor = &Theme::getThemeColor(Theme::PLAYER);
-    mNameColor = &userPalette->getColor(UserPalette::SELF);
-
-    initTargetCursor();
-
-    config.addListener("showownname", this);
     setShowName(config.getValue("showownname", 1));
+
+    listen(CHANNEL_CONFIG);
+    listen(CHANNEL_ACTORSPRITE);
 }
 
 LocalPlayer::~LocalPlayer()
 {
-    delete mInventory;
-
-    config.removeListener("showownname", this);
-
-    for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
-    {
-        delete mTargetCursor[0][i];
-        delete mTargetCursor[1][i];
-        mTargetCursorImages[0][i]->decRef();
-        mTargetCursorImages[1][i]->decRef();
-    }
-
     delete mAwayDialog;
     delete mAwayListener;
 }
@@ -170,21 +133,7 @@ void LocalPlayer::logic()
         mMessageTime--;
     }
 
-    if ((mSpecialRechargeUpdateNeeded%11) == 0)
-    {
-        mSpecialRechargeUpdateNeeded = 0;
-        for (std::map<int, Special>::iterator i = mSpecials.begin();
-             i != mSpecials.end();
-             i++)
-        {
-            i->second.currentMana += i->second.recharge;
-            if (i->second.currentMana > i->second.neededMana)
-            {
-                i->second.currentMana = i->second.neededMana;
-            }
-        }
-    }
-    mSpecialRechargeUpdateNeeded++;
+    PlayerInfo::logic();
 
     // Targeting allowed 4 times a second
     if (get_elapsed_time(mLastTarget) >= 250)
@@ -200,11 +149,10 @@ void LocalPlayer::logic()
 
     if (mTarget)
     {
-        if (mTarget->getType() == Being::NPC)
+        if (mTarget->getType() == ActorSprite::NPC)
         {
             // NPCs are always in range
-            mTarget->setTargetAnimation(
-                mTargetCursor[0][mTarget->getTargetCursorSize()]);
+            mTarget->setTargetType(TCT_IN_RANGE);
         }
         else
         {
@@ -220,10 +168,10 @@ void LocalPlayer::logic()
                 abs(mTarget->getTileY() - getTileY());
 
             const int attackRange = getAttackRange();
-            const int inRange = rangeX > attackRange || rangeY > attackRange
-                                                                    ? 1 : 0;
-            mTarget->setTargetAnimation(
-                mTargetCursor[inRange][mTarget->getTargetCursorSize()]);
+            const TargetCursorType targetType = rangeX > attackRange ||
+                                                rangeY > attackRange ?
+                                                TCT_NORMAL : TCT_IN_RANGE;
+            mTarget->setTargetType(targetType);
 
             if (!mTarget->isAlive())
                 stopAttack();
@@ -233,7 +181,7 @@ void LocalPlayer::logic()
         }
     }
 
-    Player::logic();
+    Being::logic();
 }
 
 void LocalPlayer::setAction(Action action, int attackType)
@@ -244,12 +192,7 @@ void LocalPlayer::setAction(Action action, int attackType)
         setTarget(NULL);
     }
 
-    Player::setAction(action, attackType);
-}
-
-void LocalPlayer::setGM(bool gm)
-{
-    mIsGM = gm;
+    Being::setAction(action, attackType);
 }
 
 void LocalPlayer::setGMLevel(int level)
@@ -635,7 +578,7 @@ void LocalPlayer::nextTile(unsigned char dir = 0)
         }
 
 
-        Player::nextTile();
+        Being::nextTile();
     }
     else
     {
@@ -674,7 +617,6 @@ void LocalPlayer::inviteToGuild(Being *being)
 {
     if (being->getType() != PLAYER)
         return;
-    Player *player = static_cast<Player*>(being);
 
     // TODO: Allow user to choose which guild to invite being to
     // For now, just invite to the first guild you have permissions to invite with
@@ -684,31 +626,20 @@ void LocalPlayer::inviteToGuild(Being *being)
     {
         if (checkInviteRights(itr->second->getName()))
         {
-            Net::getGuildHandler()->invite(itr->second->getId(), player);
+            Net::getGuildHandler()->invite(itr->second->getId(), being);
             return;
         }
     }
 }
 
-void LocalPlayer::clearInventory()
-{
-    mEquipment->clear();
-    mInventory->clear();
-}
-
-void LocalPlayer::setInvItem(int index, int id, int amount)
-{
-    bool equipment = false;
-    int itemType = ItemDB::get(id).getType();
-    if (itemType != ITEM_UNUSABLE && itemType != ITEM_USABLE)
-        equipment = true;
-    mInventory->setItem(index, id, amount, equipment);
-}
-
 void LocalPlayer::pickUp(FloorItem *item)
 {
-    int dx = item->getX() - getTileX();
-    int dy = item->getY() - getTileY();
+    if (!item)
+        return;
+
+    int dx = item->getTileX() - (int) getPosition().x / mMap->getTileWidth();
+    int dy = item->getTileY() - ((int) getPosition().y - 1)
+             / mMap->getTileHeight();
 
     if (dx * dx + dy * dy < 4)
     {
@@ -719,12 +650,12 @@ void LocalPlayer::pickUp(FloorItem *item)
     {
         if (Net::getNetworkType() == ServerInfo::MANASERV)
         {
-            setDestination(item->getX() * 32 + 16, item->getY() * 32 + 16);
+            setDestination(item->getPixelX() + 16, item->getPixelY() + 16);
             mPickUpTarget = item;
         }
         else
         {
-            setDestination(item->getX(), item->getY());
+            setDestination(item->getTileX(), item->getTileY());
             mPickUpTarget = item;
             stopAttack();
         }
@@ -757,15 +688,24 @@ void LocalPlayer::setTarget(Being *target)
         mTargetTime = -1;
     }
 
+    Being *oldTarget = 0;
     if (mTarget)
+    {
         mTarget->untarget();
+        oldTarget = mTarget;
+    }
 
-    if (mTarget && mTarget->getType() == Being::MONSTER)
+    if (mTarget && mTarget->getType() == ActorSprite::MONSTER)
         mTarget->setShowName(false);
 
     mTarget = target;
 
-    if (target && target->getType() == Being::MONSTER)
+    if (oldTarget)
+        oldTarget->updateName();
+    if (mTarget)
+        mTarget->updateName();
+
+    if (target && target->getType() == ActorSprite::MONSTER)
         target->setShowName(true);
 }
 
@@ -805,13 +745,10 @@ void LocalPlayer::setWalkingDir(int dir)
 
         // Else, he is not pressing a key,
         // and the current path hasn't been sent by mouse,
-        // then, stop (sending to server).
+        // then let the path die (1/2 tile after that.)
+        // This permit to avoid desyncs with other clients.
         else if (!dir)
-        {
-            if (!mPathSetByMouse)
-                player_node->stopWalking(true);
             return;
-        }
 
         // If the delay to send another walk message to the server hasn't expired,
         // don't do anything or we could get disconnected for spamming the server
@@ -822,11 +759,11 @@ void LocalPlayer::setWalkingDir(int dir)
     mWalkingDir = dir;
 
     // If we're not already walking, start walking.
-    if (mAction != WALK && dir)
+    if (mAction != MOVE && dir)
     {
         startWalking(dir);
     }
-    else if (mAction == WALK && (Net::getNetworkType() == ServerInfo::MANASERV))
+    else if (mAction == MOVE && (Net::getNetworkType() == ServerInfo::MANASERV))
     {
         nextTile(dir);
     }
@@ -839,7 +776,7 @@ void LocalPlayer::startWalking(unsigned char dir)
     if (!mMap || !dir)
         return;
 
-    if (mAction == WALK && !mPath.empty())
+    if (mAction == MOVE && !mPath.empty())
     {
         // Just finish the current action, otherwise we get out of sync
         if (Net::getNetworkType() == ServerInfo::MANASERV)
@@ -862,6 +799,10 @@ void LocalPlayer::startWalking(unsigned char dir)
     if (dir & RIGHT)
         dx++;
 
+    // Update the direction when the walk just start
+    if (Net::getNetworkType() == ServerInfo::MANASERV)
+        setDirection(dir);
+
     if (Net::getNetworkType() == ServerInfo::TMWATHENA)
     {
         // Prevent skipping corners over colliding tiles
@@ -894,7 +835,7 @@ void LocalPlayer::startWalking(unsigned char dir)
 
 void LocalPlayer::stopWalking(bool sendToServer)
 {
-    if (mAction == WALK && mWalkingDir)
+    if (mAction == MOVE && mWalkingDir)
     {
         mWalkingDir = 0;
         mLocalWalkTime = 0;
@@ -938,20 +879,6 @@ void LocalPlayer::emote(Uint8 emotion)
     Net::getPlayerHandler()->emote(emotion);
 }
 
-void LocalPlayer::useSpecial(int special)
-{
-    Net::getSpecialHandler()->use(special);
-}
-
-void LocalPlayer::setSpecialStatus(int id, int current, int max, int recharge)
-{
-    logger->log("SpecialUpdate Skill #%d -- (%d/%d) -> %d", id, current, max,
-                recharge);
-    mSpecials[id].currentMana = current;
-    mSpecials[id].neededMana = max;
-    mSpecials[id].recharge = recharge;
-}
-
 void LocalPlayer::attack(Being *target, bool keep)
 {
     if (Net::getNetworkType() == ServerInfo::MANASERV)
@@ -966,7 +893,7 @@ void LocalPlayer::attack(Being *target, bool keep)
 
     mKeepAttacking = keep;
 
-    if (!target || target->getType() == Being::NPC)
+    if (!target || target->getType() == ActorSprite::NPC)
         return;
 
     if (mTarget != target || !mTarget)
@@ -974,6 +901,7 @@ void LocalPlayer::attack(Being *target, bool keep)
         mLastTarget = -1;
         setTarget(target);
     }
+
     if (Net::getNetworkType() == ServerInfo::MANASERV)
     {
         Vector plaPos = this->getPosition();
@@ -1025,7 +953,7 @@ void LocalPlayer::attack(Being *target, bool keep)
         Net::getPlayerHandler()->setDirection(direction);
         setDirection(direction);
 
-        mWalkTime = tick_time;
+        mActionTime = tick_time;
         mTargetTime = tick_time;
     }
 
@@ -1056,189 +984,6 @@ void LocalPlayer::stopAttack()
     mLastTarget = -1;
 }
 
-void LocalPlayer::raiseAttribute(int attr)
-{
-    // we assume that the server allows the change.
-    // When not we will undo it later.
-    mCharacterPoints--;
-    IntMap::iterator it = mAttributeBase.find(attr);
-    if (it != mAttributeBase.end())
-        (*it).second++;
-    Net::getPlayerHandler()->increaseAttribute(attr);
-}
-
-void LocalPlayer::lowerAttribute(int attr)
-{
-    // we assume that the server allows the change.
-    // When not we will undo it later.
-    mCorrectionPoints--;
-    mCharacterPoints++;
-    IntMap::iterator it = mAttributeBase.find(attr);
-    if (it != mAttributeBase.end())
-        (*it).second--;
-    Net::getPlayerHandler()->decreaseAttribute(attr);
-}
-
-void LocalPlayer::setTotalWeight(int value)
-{
-    mTotalWeight = value;
-
-    inventoryWindow->updateWeight();
-}
-
-void LocalPlayer::setMaxWeight(int value)
-{
-    mMaxWeight = value;
-
-    inventoryWindow->updateWeight();
-}
-
-void LocalPlayer::setAttributeBase(int num, int value, bool notify)
-{
-    int old = mAttributeBase[num];
-
-    mAttributeBase[num] = value;
-    if (skillDialog)
-    {
-        if (skillDialog->update(num).empty() || !(value > old))
-            return;
-
-        if (old != 0 && notify)
-            effectManager->trigger(1, this);
-    }
-
-    if (statusWindow)
-        statusWindow->update(num);
-}
-
-void LocalPlayer::setAttributeEffective(int num, int value)
-{
-    mAttributeEffective[num] = value;
-    if (skillDialog)
-        skillDialog->update(num);
-
-    if (statusWindow)
-        statusWindow->update(num);
-}
-
-void LocalPlayer::setCharacterPoints(int n)
-{
-    mCharacterPoints = n;
-
-    if (statusWindow)
-        statusWindow->update(StatusWindow::CHAR_POINTS);
-}
-
-void LocalPlayer::setCorrectionPoints(int n)
-{
-    mCorrectionPoints = n;
-
-    if (statusWindow)
-        statusWindow->update(StatusWindow::CHAR_POINTS);
-}
-
-void LocalPlayer::setSkillPoints(int points)
-{
-    mSkillPoints = points;
-    if (skillDialog)
-        skillDialog->update();
-}
-
-void LocalPlayer::setExperience(int skill, int current, int next, bool notify)
-{
-    std::pair<int, int> cur = getExperience(skill);
-    int diff = current - cur.first;
-
-    cur = std::pair<int, int>(current, next);
-
-    mSkillExp[skill] = cur;
-
-    std::string name;
-    if (skillDialog)
-        name = skillDialog->update(skill);
-
-    if (mMap && notify && cur.first != -1 && diff > 0 && !name.empty())
-    {
-        addMessageToQueue(strprintf("%d %s xp", diff, name.c_str()));
-    }
-
-    if (statusWindow)
-        statusWindow->update(skill);
-}
-
-std::pair<int, int> LocalPlayer::getExperience(int skill)
-{
-    return mSkillExp[skill];
-}
-
-void LocalPlayer::setHp(int value)
-{
-    mHp = value;
-
-    if (statusWindow)
-        statusWindow->update(StatusWindow::HP);
-}
-
-void LocalPlayer::setMaxHp(int value)
-{
-    mMaxHp = value;
-
-    if (statusWindow)
-        statusWindow->update(StatusWindow::HP);
-}
-
-void LocalPlayer::setLevel(int value)
-{
-    mLevel = value;
-
-    if (statusWindow)
-        statusWindow->update(StatusWindow::LEVEL);
-}
-
-void LocalPlayer::setExp(int value, bool notify)
-{
-    if (mMap && notify && value > mExp)
-    {
-        addMessageToQueue(toString(value - mExp) + " xp");
-    }
-    mExp = value;
-
-    if (statusWindow)
-        statusWindow->update(StatusWindow::EXP);
-}
-
-void LocalPlayer::setExpNeeded(int value)
-{
-    mExpNeeded = value;
-
-    if (statusWindow)
-        statusWindow->update(StatusWindow::EXP);
-}
-
-void LocalPlayer::setMP(int value)
-{
-    mMp = value;
-
-    if (statusWindow)
-        statusWindow->update(StatusWindow::MP);
-}
-
-void LocalPlayer::setMaxMP(int value)
-{
-    mMaxMp = value;
-
-    if (statusWindow)
-        statusWindow->update(StatusWindow::MP);
-}
-
-void LocalPlayer::setMoney(int value)
-{
-    mMoney = value;
-
-    if (statusWindow)
-        statusWindow->update(StatusWindow::MONEY);
-}
-
 void LocalPlayer::pickedUp(const ItemInfo &itemInfo, int amount,
                            unsigned char fail)
 {
@@ -1259,7 +1004,7 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, int amount,
         }
         if (config.getValue("showpickupchat", 1))
         {
-            localChatTab->chatLog(_(msg), BY_SERVER);
+            SERVER_NOTICE(_(msg))
         }
         if (mMap && config.getValue("showpickupparticle", 0))
         {
@@ -1273,10 +1018,9 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, int amount,
         {
             // TRANSLATORS: This sentence may be translated differently
             // for different grammatical numbers (singular, plural, ...)
-            localChatTab->chatLog(strprintf(ngettext("You picked up %d "
+            SERVER_NOTICE(strprintf(ngettext("You picked up %d "
                     "[@@%d|%s@@].", "You picked up %d [@@%d|%s@@].", amount),
-                    amount, itemInfo.getId(), itemInfo.getName().c_str()),
-                    BY_SERVER);
+                    amount, itemInfo.getId(), itemInfo.getName().c_str()))
         }
 
         if (mMap && config.getValue("showpickupparticle", 0))
@@ -1299,11 +1043,16 @@ int LocalPlayer::getAttackRange()
     }
     else
     {
-        Item *weapon = mEquipment->getEquipment(EQUIP_FIGHT1_SLOT);
-        if (weapon)
+        if (Net::getNetworkType() == ServerInfo::TMWATHENA)
         {
-            const ItemInfo info = weapon->getInfo();
-            return info.getAttackRange();
+            // TODO: Fix this to be more generic
+            Item *weapon = PlayerInfo::getEquipment(
+                                                  TmwAthena::EQUIP_FIGHT1_SLOT);
+            if (weapon)
+            {
+                const ItemInfo info = weapon->getInfo();
+                return info.getAttackRange();
+            }
         }
         return 48; // unarmed range
     }
@@ -1351,102 +1100,50 @@ void LocalPlayer::setGotoTarget(Being *target)
     }
 }
 
-extern MiniStatusWindow *miniStatusWindow;
-
-void LocalPlayer::handleStatusEffect(StatusEffect *effect, int effectId)
+void LocalPlayer::addMessageToQueue(const std::string &message, int color)
 {
-    Being::handleStatusEffect(effect, effectId);
+    mMessages.push_back(MessagePair(message, color));
+}
 
-    if (effect)
+void LocalPlayer::event(Channels channel, const Mana::Event &event)
+{
+    if (channel == CHANNEL_ACTORSPRITE)
     {
-        effect->deliverMessage();
-        effect->playSFX();
+        if (event.getName() == EVENT_DESTROYED)
+        {
+            ActorSprite *actor = event.getActor("source");
 
-        AnimatedSprite *sprite = effect->getIcon();
+            if (mPickUpTarget == actor)
+                mPickUpTarget = 0;
 
-        if (!sprite)
-        {
-            // delete sprite, if necessary
-            for (unsigned int i = 0; i < mStatusEffectIcons.size();)
-                if (mStatusEffectIcons[i] == effectId)
-                {
-                    mStatusEffectIcons.erase(mStatusEffectIcons.begin() + i);
-                    miniStatusWindow->eraseIcon(i);
-                }
-                else
-                    i++;
+            if (mTarget == actor)
+                mTarget = 0;
         }
-        else
+    }
+    else if (channel == CHANNEL_ATTRIBUTES)
+    {
+        if (event.getName() == EVENT_UPDATEATTRIBUTE)
         {
-            // replace sprite or append
-            bool found = false;
-
-            for (unsigned int i = 0; i < mStatusEffectIcons.size(); i++)
-                if (mStatusEffectIcons[i] == effectId)
-                {
-                    miniStatusWindow->setIcon(i, sprite);
-                    found = true;
-                    break;
-                }
+            if (event.getInt("id") == EXP)
+            {
+                int change = event.getInt("newValue")
+                        - event.getInt("oldValue");
 
-            if (!found)
-            { // add new
-                int offset = mStatusEffectIcons.size();
-                miniStatusWindow->setIcon(offset, sprite);
-                mStatusEffectIcons.push_back(effectId);
+                addMessageToQueue(toString(change) + " xp");
             }
         }
     }
-}
-
-void LocalPlayer::initTargetCursor()
-{
-    // Load target cursors
-    loadTargetCursor("target-cursor-blue-s.png", 44, 35, false, TC_SMALL);
-    loadTargetCursor("target-cursor-red-s.png", 44, 35, true, TC_SMALL);
-    loadTargetCursor("target-cursor-blue-m.png", 62, 44, false, TC_MEDIUM);
-    loadTargetCursor("target-cursor-red-m.png", 62, 44, true, TC_MEDIUM);
-    loadTargetCursor("target-cursor-blue-l.png", 82, 60, false, TC_LARGE);
-    loadTargetCursor("target-cursor-red-l.png", 82, 60, true, TC_LARGE);
-}
-
-void LocalPlayer::loadTargetCursor(const std::string &filename,
-                                   int width, int height,
-                                   bool outRange, TargetCursorSize size)
-{
-    assert(size > -1);
-    assert(size < 3);
-
-    ImageSet *currentImageSet = Theme::getImageSetFromTheme(filename,
-                                                            width, height);
-    Animation *anim = new Animation;
-
-    for (unsigned int i = 0; i < currentImageSet->size(); ++i)
+    else if (channel == CHANNEL_CONFIG)
     {
-        anim->addFrame(currentImageSet->get(i), 75,
-                      (16 - (currentImageSet->getWidth() / 2)),
-                      (16 - (currentImageSet->getHeight() / 2)));
-    }
-
-    SimpleAnimation *currentCursor = new SimpleAnimation(anim);
-
-    const int index = outRange ? 1 : 0;
-
-    mTargetCursorImages[index][size] = currentImageSet;
-    mTargetCursor[index][size] = currentCursor;
-}
-
-void LocalPlayer::addMessageToQueue(const std::string &message, int color)
-{
-    mMessages.push_back(MessagePair(message, color));
-}
+        if (event.getName() == EVENT_CONFIGOPTIONCHANGED &&
+            event.getString("option") == "showownname")
+        {
+            setShowName(config.getValue("showownname", 1));
+        }
 
-void LocalPlayer::optionChanged(const std::string &value)
-{
-    if (value == "showownname")
-    {
-        setShowName(config.getValue("showownname", 1));
     }
+
+    Being::event(channel, event);
 }
 
 void LocalPlayer::changeAwayMode()
diff --git a/src/localplayer.h b/src/localplayer.h
index 8033263b..b1a41697 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -22,9 +22,9 @@
 #ifndef LOCALPLAYER_H
 #define LOCALPLAYER_H
 
-#include "player.h"
+#include "being.h"
 
-#include "gui/userpalette.h"
+#include "resources/userpalette.h"
 
 #include <guichan/actionlistener.hpp>
 
@@ -32,80 +32,18 @@
 #include <vector>
 
 class ChatTab;
-class Equipment;
 class FloorItem;
 class ImageSet;
-class Inventory;
 class Item;
 class Map;
 class OkDialog;
 
-
-struct Special
-{
-    int currentMana;
-    int neededMana;
-    int recharge;
-};
-
 class AwayListener : public gcn::ActionListener
 {
     public:
         void action(const gcn::ActionEvent &event);
 };
 
-
-/**
- * Attributes used during combat. Available to all the beings.
- */
-enum
-{
-BASE_ATTR_BEGIN = 0,
-    BASE_ATTR_PHY_ATK_MIN = BASE_ATTR_BEGIN,
-    BASE_ATTR_PHY_ATK_DELTA,
-                       /**< Physical attack power. */
-    BASE_ATTR_MAG_ATK, /**< Magical attack power. */
-    BASE_ATTR_PHY_RES, /**< Resistance to physical damage. */
-    BASE_ATTR_MAG_RES, /**< Resistance to magical damage. */
-    BASE_ATTR_EVADE,   /**< Ability to avoid hits. */
-    BASE_ATTR_HIT,     /**< Ability to hit stuff. */
-    BASE_ATTR_HP,      /**< Hit Points (Base value: maximum, Modded value: current) */
-    BASE_ATTR_HP_REGEN,/**< number of HP regenerated every 10 game ticks */
-    BASE_ATTR_END,
-    BASE_ATTR_NB = BASE_ATTR_END - BASE_ATTR_BEGIN,
-
-    BASE_ELEM_BEGIN = BASE_ATTR_END,
-    BASE_ELEM_NEUTRAL = BASE_ELEM_BEGIN,
-    BASE_ELEM_FIRE,
-    BASE_ELEM_WATER,
-    BASE_ELEM_EARTH,
-    BASE_ELEM_AIR,
-    BASE_ELEM_SACRED,
-    BASE_ELEM_DEATH,
-    BASE_ELEM_END,
-    BASE_ELEM_NB = BASE_ELEM_END - BASE_ELEM_BEGIN,
-
-    NB_BEING_ATTRIBUTES = BASE_ELEM_END
-};
-
-/**
- * Attributes of characters. Used to derive being attributes.
- */
-enum
-{
-    CHAR_ATTR_BEGIN = NB_BEING_ATTRIBUTES,
-    CHAR_ATTR_STRENGTH = CHAR_ATTR_BEGIN,
-    CHAR_ATTR_AGILITY,
-    CHAR_ATTR_DEXTERITY,
-    CHAR_ATTR_VITALITY,
-    CHAR_ATTR_INTELLIGENCE,
-    CHAR_ATTR_WILLPOWER,
-    CHAR_ATTR_END,
-    CHAR_ATTR_NB = CHAR_ATTR_END - CHAR_ATTR_BEGIN,
-
-    NB_CHARACTER_ATTRIBUTES = CHAR_ATTR_END
-};
-
 /**
  * Reasons an item can fail to be picked up.
  */
@@ -124,7 +62,7 @@ enum
 /**
  * The local player character.
  */
-class LocalPlayer : public Player
+class LocalPlayer : public Being
 {
     public:
         /**
@@ -159,11 +97,6 @@ class LocalPlayer : public Player
         virtual void nextTile(unsigned char dir);
 
         /**
-         * Returns the player's inventory.
-         */
-        Inventory *getInventory() const { return mInventory; }
-
-        /**
          * Check the player has permission to invite users to specific guild
          */
         bool checkInviteRights(const std::string &guildName);
@@ -173,9 +106,6 @@ class LocalPlayer : public Player
          */
         void inviteToGuild(Being *being);
 
-        void clearInventory();
-        void setInvItem(int index, int id, int amount);
-
         void pickUp(FloorItem *item);
 
         /**
@@ -187,33 +117,8 @@ class LocalPlayer : public Player
          * Gets the attack range.
          */
         int getAttackRange();
-
-        /**
-         * Returns true when the player is ready to accept a trade offer.
-         * Returns false otherwise.
-         */
-        bool tradeRequestOk() const { return !mTrading; }
-
-        /**
-         * Sets the trading state of the player, i.e. whether or not he is
-         * currently involved into some trade.
-         */
-        void setTrading(bool trading) { mTrading = trading; }
-
-        void useSpecial(int id);
-
-        void setSpecialStatus(int id, int current, int max, int recharge);
-
-        const std::map<int, Special> &getSpecialStatus() const
-        { return mSpecials; }
-
         void attack(Being *target = NULL, bool keep = false);
 
-        /**
-         * Triggers whether or not to show the name as a GM name.
-         */
-        virtual void setGM(bool gm);
-
         void setGMLevel(int level);
 
         void stopAttack();
@@ -272,16 +177,6 @@ class LocalPlayer : public Player
          */
         void stopWalking(bool sendToServer = true);
 
-        /**
-         * Uses a character point to raise an attribute
-         */
-        void raiseAttribute(int attr);
-
-        /**
-         * Uses a correction point to lower an attribute
-         */
-        void lowerAttribute(int attr);
-
         void toggleSit();
         void emote(Uint8 emotion);
 
@@ -291,85 +186,6 @@ class LocalPlayer : public Player
         void pickedUp(const ItemInfo &itemInfo, int amount,
                       unsigned char fail);
 
-        int getHp() const
-        { return mHp; }
-
-        int getMaxHp() const
-        { return mMaxHp; }
-
-        void setHp(int value);
-
-        void setMaxHp(int value);
-
-        int getLevel() const
-        { return mLevel; }
-
-        void setLevel(int value);
-
-        void setExp(int value, bool notify = true);
-
-        int getExp() const
-        { return mExp; }
-
-        void setExpNeeded(int value);
-
-        int getExpNeeded() const
-        { return mExpNeeded; }
-
-        void setMP(int value);
-
-        int getMP() const
-        { return mMp; }
-
-        void setMaxMP(int value);
-
-        int getMaxMP() const
-        { return mMaxMp; }
-
-        int getMoney() const
-        { return mMoney; }
-
-        void setMoney(int value);
-
-        int getTotalWeight() const
-        { return mTotalWeight; }
-
-        void setTotalWeight(int value);
-
-        int getMaxWeight() const
-        { return mMaxWeight; }
-
-        void setMaxWeight(int value);
-
-        int getAttributeBase(int num)
-        { return mAttributeBase[num]; }
-
-        void setAttributeBase(int num, int value, bool notify = true);
-
-        int getAttributeEffective(int num)
-        { return mAttributeEffective[num]; }
-
-        void setAttributeEffective(int num, int value);
-
-        int getCharacterPoints() const
-        { return mCharacterPoints; }
-
-        void setCharacterPoints(int n);
-
-        int getCorrectionPoints() const
-        { return mCorrectionPoints; }
-
-        void setCorrectionPoints(int n);
-
-        int getSkillPoints() const
-        { return mSkillPoints; }
-
-        void setSkillPoints(int points);
-
-        void setExperience(int skill, int current, int next, bool notify = true);
-
-        std::pair<int, int> getExperience(int skill);
-
         void setShowIp(bool show)
         { mShowIp = show; }
 
@@ -396,10 +212,7 @@ class LocalPlayer : public Player
         void addMessageToQueue(const std::string &message,
                                int color = UserPalette::EXP_INFO);
 
-        /**
-         * Called when a option (set with config.addListener()) is changed
-         */
-        void optionChanged(const std::string &value);
+        void event(Channels channel, const Mana::Event &event);
 
         /**
          * Tells the engine wether to check
@@ -413,19 +226,10 @@ class LocalPlayer : public Player
          */
         bool getCheckNameSetting() const { return mUpdateName; }
 
-        /**  Keeps the Equipment related values */
-        const std::auto_ptr<Equipment> mEquipment;
-
     protected:
-
         /** Whether or not the name settings have changed */
         bool mUpdateName;
 
-        virtual void handleStatusEffect(StatusEffect *effect, int effectId);
-
-        // Colors don't change for local player
-        virtual void updateColors() {}
-
         void startWalking(unsigned char dir);
 
         int mAttackRange;
@@ -433,73 +237,32 @@ class LocalPlayer : public Player
         int mTargetTime;      /** How long the being has been targeted **/
         int mLastTarget;      /** Time stamp of last targeting action, -1 if none. */
 
-        // Character status:
-        typedef std::map<int, int> IntMap;
-        IntMap mAttributeBase;
-        IntMap mAttributeEffective;
-        std::map<int, std::pair<int, int> > mSkillExp;
-        int mCharacterPoints;
-        int mCorrectionPoints;
-        int mLevelProgress;
-        std::map<int, Special> mSpecials;
-        char mSpecialRechargeUpdateNeeded;
-        int mLevel;
-        int mExp, mExpNeeded;
-        int mMp, mMaxMp;
-        int mMoney;
-        int mTotalWeight;
-        int mMaxWeight;
-        int mHp;
-        int mMaxHp;
-        int mSkillPoints;
-
         int mGMLevel;
 
         Being *mTarget;
 
         FloorItem *mPickUpTarget;
 
-        bool mTrading;
         bool mGoingToTarget;
         bool mKeepAttacking;  /** Whether or not to continue to attack */
         int mLastAction;      /**< Time stamp of the last action, -1 if none. */
         int mWalkingDir;      /**< The direction the player is walking in. */
         bool mPathSetByMouse; /**< Tells if the path was set using mouse */
 
-        std::vector<int> mStatusEffectIcons;
-
-        Inventory *mInventory;
-
         int mLocalWalkTime;   /**< Timestamp used to control keyboard walk
                                   messages flooding */
 
-        /** Load the target cursors into memory */
-        void initTargetCursor();
-
-        /**
-         * Helper function for loading target cursors
-         */
-        void loadTargetCursor(const std::string &filename,
-                              int width, int height,
-                              bool outRange, Being::TargetCursorSize size);
-
-        /** Images of the target cursor. */
-        ImageSet *mTargetCursorImages[2][NUM_TC];
-
-        /** Animated target cursors. */
-        SimpleAnimation *mTargetCursor[2][NUM_TC];
-
         typedef std::pair<std::string, int> MessagePair;
-        /** Queued exp messages*/
+        /** Queued messages*/
         std::list<MessagePair> mMessages;
         int mMessageTime;
+
+        bool mShowIp;
+
         AwayListener *mAwayListener;
         OkDialog *mAwayDialog;
-
         int mAfkTime;
         bool mAwayMode;
-
-        bool mShowIp;
 };
 
 extern LocalPlayer *player_node;
diff --git a/src/log.cpp b/src/log.cpp
index 5880e108..a147c107 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -21,8 +21,6 @@
 
 #include "log.h"
 
-#include "gui/widgets/chattab.h"
-
 #ifdef WIN32
 #include <windows.h>
 #elif __APPLE__
@@ -32,11 +30,12 @@
 #include <sys/time.h>
 #include <iostream>
 #include <sstream>
+#include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 Logger::Logger():
-    mLogToStandardOut(true),
-    mChatWindow(NULL)
+    mLogToStandardOut(true)
 {
 }
 
@@ -99,11 +98,6 @@ void Logger::log(const char *log_text, ...)
         std::cout << timeStr.str() << buf << std::endl;
     }
 
-    if (mChatWindow)
-    {
-        localChatTab->chatLog(buf, BY_LOGGER);
-    }
-
     // Delete temporary buffer
     delete[] buf;
 }
diff --git a/src/log.h b/src/log.h
index 50fca577..4615f626 100644
--- a/src/log.h
+++ b/src/log.h
@@ -24,8 +24,6 @@
 
 #include <fstream>
 
-class ChatWindow;
-
 /**
  * The Log Class : Useful to write debug or info messages
  */
@@ -53,11 +51,6 @@ class Logger
         void setLogToStandardOut(bool value) { mLogToStandardOut = value; }
 
         /**
-         * Enables logging to chat window
-         */
-        void setChatWindow(ChatWindow *window) { mChatWindow = window; }
-
-        /**
          * Enters a message in the log. The message will be timestamped.
          */
         void log(const char *log_text, ...)
@@ -75,7 +68,6 @@ class Logger
     private:
         std::ofstream mLogFile;
         bool mLogToStandardOut;
-        ChatWindow *mChatWindow;
 };
 
 extern Logger *logger;
diff --git a/src/main.cpp b/src/main.cpp
index c130bba9..41f1c3d5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,6 +40,10 @@ static void printHelp()
 
     std::cout
         << _("mana [options] [mana-file]") << endl << endl
+        << _("[mana-file] : The mana file is an XML file (.mana)") << endl
+        << _("              used to set custom parameters") << endl
+        << _("              to the mana client.")
+        << endl << endl
         << _("Options:") << endl
         << _("  -v --version        : Display the version") << endl
         << _("  -h --help           : Display this help") << endl
@@ -54,7 +58,8 @@ static void printHelp()
                                      "character") << endl
         << _("  -u --skip-update    : Skip the update downloads") << endl
         << _("  -d --data           : Directory to load game data from") << endl
-        << _("  -L --localdata-dir  : Directory to use as local data directory") << endl
+        << _("     --localdata-dir  : Directory to use as local data directory") << endl
+        << _("     --chat-log-dir   : Chat log dir to use") << endl
         << _("     --screenshot-dir : Directory to store screenshots") << endl
 #ifdef USE_OPENGL
         << _("     --no-opengl      : Disable OpenGL for this session") << endl
@@ -69,7 +74,7 @@ static void printVersion()
 
 static void parseOptions(int argc, char *argv[], Client::Options &options)
 {
-    const char *optstring = "hvud:U:P:Dc:s:p:C:L:";
+    const char *optstring = "hvud:U:P:Dc:s:p:C:";
 
     const struct option long_options[] = {
         { "config-dir",     required_argument, 0, 'C' },
@@ -85,6 +90,7 @@ static void parseOptions(int argc, char *argv[], Client::Options &options)
         { "skip-update",    no_argument,       0, 'u' },
         { "username",       required_argument, 0, 'U' },
         { "no-opengl",      no_argument,       0, 'O' },
+        { "chat-log-dir",   required_argument, 0, 'T' },
         { "version",        no_argument,       0, 'v' },
         { "screenshot-dir", required_argument, 0, 'i' },
         { 0 }
@@ -143,6 +149,8 @@ static void parseOptions(int argc, char *argv[], Client::Options &options)
             case 'O':
                 options.noOpenGL = true;
                 break;
+            case 'T':
+                options.chatLogDir = std::string(optarg);
             case 'i':
                 options.screenshotDir = optarg;
                 break;
diff --git a/src/main.h b/src/main.h
index 341ab1d0..3a644100 100644
--- a/src/main.h
+++ b/src/main.h
@@ -78,6 +78,8 @@
 #define PACKAGE_OS "Linux"
 #elif defined __GNU__
 #define PACKAGE_OS "GNU Hurd"
+#elif defined __HAIKU__
+#define PACKAGE_OS "Haiku"
 #elif defined WIN32 || defined _WIN32 || defined __WIN32__ || defined __NT__ \
     || defined WIN64 || defined _WIN64 || defined __WIN64__
 #define PACKAGE_OS "Windows"
diff --git a/src/map.cpp b/src/map.cpp
index f845f2ff..87c902f6 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -21,23 +21,25 @@
 
 #include "map.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
 #include "client.h"
 #include "configuration.h"
 #include "graphics.h"
 #include "particle.h"
 #include "simpleanimation.h"
-#include "sprite.h"
 #include "tileset.h"
 
 #include "resources/ambientlayer.h"
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
+#include "net/net.h"
+
 #include "utils/dtor.h"
 #include "utils/stringutils.h"
 
 #include <queue>
+#include <limits.h>
 
 /**
  * A location on a tile map. Used for pathfinding, open list.
@@ -122,7 +124,7 @@ Image* MapLayer::getTile(int x, int y) const
 
 void MapLayer::draw(Graphics *graphics, int startX, int startY,
                     int endX, int endY, int scrollX, int scrollY,
-                    const MapSprites &sprites, int debugFlags) const
+                    const Actors &actors, int debugFlags) const
 {
     startX -= mX;
     startY -= mY;
@@ -134,47 +136,86 @@ void MapLayer::draw(Graphics *graphics, int startX, int startY,
     if (endX > mWidth) endX = mWidth;
     if (endY > mHeight) endY = mHeight;
 
-    MapSprites::const_iterator si = sprites.begin();
+    Actors::const_iterator ai = actors.begin();
+
+    int dx = (mX * 32) - scrollX;
+    int dy = (mY * 32) - scrollY + 32;
 
     for (int y = startY; y < endY; y++)
     {
-        // If drawing the fringe layer, make sure all sprites above this row of
+        int y32 = y * 32;
+
+        // If drawing the fringe layer, make sure all actors above this row of
         // tiles have been drawn
         if (mIsFringeLayer)
         {
-            while (si != sprites.end() && (*si)->getPixelY() <= y * 32)
+            while (ai != actors.end() && (*ai)->getPixelY() <= y * 32)
             {
-                (*si)->setAlpha(1.0f);
-                (*si)->draw(graphics, -scrollX, -scrollY);
-                si++;
+                (*ai)->draw(graphics, -scrollX, -scrollY);
+                ai++;
             }
         }
 
-        for (int x = startX; x < endX; x++)
+        if (debugFlags != Map::MAP_SPECIAL3)
         {
-            Image *img = getTile(x, y);
-            if (img)
+            const int py0 = y32 + dy;
+
+            for (int x = startX; x < endX; x++)
             {
-                const int px = (x + mX) * 32 - scrollX;
-                const int py = (y + mY) * 32 - scrollY + 32 - img->getHeight();
-                if (debugFlags != Map::MAP_SPECIAL || img->getHeight() <= 32)
-                    graphics->drawImage(img, px, py);
+                Image *img = getTile(x, y);
+                if (img)
+                {
+                    const int px = (x * 32) + dx;
+                    const int py = py0 - img->getHeight();
+                    if ((debugFlags != Map::MAP_SPECIAL
+                        && debugFlags != Map::MAP_SPECIAL2)
+                        || img->getHeight() <= 32)
+                    {
+                        int width = 0;
+                        int c = getTileDrawWidth(x, y, endX, width);
+                        if (!c)
+                        {
+                            graphics->drawImage(img, px, py);
+                        }
+                        else
+                        {
+                            graphics->drawImagePattern(img, px, py,
+                                width, img->getHeight());
+                        }
+                        x += c;
+                    }
+                }
             }
         }
     }
 
-    // Draw any remaining sprites
+    // Draw any remaining actors
     if (mIsFringeLayer)
     {
-        while (si != sprites.end())
+        while (ai != actors.end())
         {
-            (*si)->setAlpha(1.0f);
-            (*si)->draw(graphics, -scrollX, -scrollY);
-            si++;
+            (*ai)->draw(graphics, -scrollX, -scrollY);
+            ai++;
         }
     }
 }
 
+int MapLayer::getTileDrawWidth(int x1, int y1, int endX, int &width) const
+{
+    Image *img1 = getTile(x1, y1);
+    int c = 0;
+    width = img1->getWidth();
+    for (int x = x1 + 1; x < endX; x++)
+    {
+        Image *img = getTile(x, y1);
+        if (img != img1)
+            break;
+        c ++;
+        width += img->getWidth();
+    }
+    return c;
+}
+
 Map::Map(int width, int height, int tileWidth, int tileHeight):
     mWidth(width), mHeight(height),
     mTileWidth(tileWidth), mTileHeight(tileHeight),
@@ -188,8 +229,8 @@ Map::Map(int width, int height, int tileWidth, int tileHeight):
     mMetaTiles = new MetaTile[size];
     for (int i = 0; i < NB_BLOCKTYPES; i++)
     {
-        mOccupation[i] = new int[size];
-        memset(mOccupation[i], 0, size * sizeof(int));
+        mOccupation[i] = new unsigned[size];
+        memset(mOccupation[i], 0, size * sizeof(unsigned));
     }
 }
 
@@ -283,7 +324,7 @@ void Map::addTileset(Tileset *tileset)
         mMaxTileHeight = tileset->getHeight();
 }
 
-bool spriteCompare(const Sprite *a, const Sprite *b)
+bool actorCompare(const Actor *a, const Actor *b)
 {
     return a->getPixelY() < b->getPixelY();
 }
@@ -309,25 +350,47 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY)
     int endX = (graphics->getWidth() + scrollX + mTileWidth - 1) / mTileWidth;
     int endY = endPixelY / mTileHeight;
 
-    // Make sure sprites are sorted ascending by Y-coordinate
+    // Make sure actors are sorted ascending by Y-coordinate
     // so that they overlap correctly
-    mSprites.sort(spriteCompare);
+    mActors.sort(actorCompare);
 
     // update scrolling of all ambient layers
     updateAmbientLayers(scrollX, scrollY);
 
     // Draw backgrounds
     drawAmbientLayers(graphics, BACKGROUND_LAYERS, scrollX, scrollY,
-            (int) config.getValue("OverlayDetail", 2));
+                      config.getIntValue("OverlayDetail"));
 
     // draw the game world
     Layers::const_iterator layeri = mLayers.begin();
-    for (; layeri != mLayers.end(); ++layeri)
+
+    bool overFringe = false;
+
+    if (mDebugFlags == MAP_SPECIAL3)
     {
-        (*layeri)->draw(graphics,
-                        startX, startY, endX, endY,
-                        scrollX, scrollY,
-                        mSprites, mDebugFlags);
+        for (; layeri != mLayers.end(); ++layeri)
+        {
+            if ((*layeri)->isFringeLayer())
+            {
+                (*layeri)->draw(graphics,
+                                startX, startY, endX, endY,
+                                scrollX, scrollY,
+                                mActors, mDebugFlags);
+            }
+        }
+    }
+    else
+    {
+        for (; layeri != mLayers.end() && !overFringe; ++layeri)
+        {
+            if ((*layeri)->isFringeLayer() && mDebugFlags == MAP_SPECIAL2)
+                overFringe = true;
+
+            (*layeri)->draw(graphics,
+                            startX, startY, endX, endY,
+                            scrollX, scrollY,
+                            mActors, mDebugFlags);
+        }
     }
 
     // If the transparency hasn't been disabled,
@@ -335,24 +398,25 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY)
     {
         // We draw beings with a lower opacity to make them visible
         // even when covered by a wall or some other elements...
-        MapSprites::const_iterator si = mSprites.begin();
-        while (si != mSprites.end())
+        Actors::const_iterator ai = mActors.begin();
+        while (ai != mActors.end())
         {
-            if (Sprite *sprite = *si)
+            if (Actor *actor = *ai)
             {
-                // For now, just draw sprites with only one layer.
-                if (sprite->getNumberOfLayers() == 1)
+                // For now, just draw actors with only one layer.
+                if (actor->getNumberOfLayers() == 1)
                 {
-                    sprite->setAlpha(0.3f);
-                    sprite->draw(graphics, -scrollX, -scrollY);
+                    actor->setAlpha(0.3f);
+                    actor->draw(graphics, -scrollX, -scrollY);
+                    actor->setAlpha(1.0f);
                 }
             }
-            si++;
+            ai++;
         }
     }
 
     drawAmbientLayers(graphics, FOREGROUND_LAYERS, scrollX, scrollY,
-            (int) config.getValue("OverlayDetail", 2));
+                      config.getIntValue("OverlayDetail"));
 }
 
 void Map::drawCollision(Graphics *graphics, int scrollX, int scrollY,
@@ -496,7 +560,8 @@ void Map::blockTile(int x, int y, BlockType type)
 
     const int tileNum = x + y * mWidth;
 
-    if ((++mOccupation[type][tileNum]) > 0)
+    if (mOccupation[type][tileNum] < UINT_MAX &&
+        (++mOccupation[type][tileNum]) > 0)
     {
         switch (type)
         {
@@ -528,12 +593,14 @@ bool Map::getWalk(int x, int y, unsigned char walkmask) const
 
 bool Map::occupied(int x, int y) const
 {
-    const Beings &beings = beingManager->getAll();
-    for (Beings::const_iterator i = beings.begin(); i != beings.end(); i++)
+    const ActorSprites &actors = actorSpriteManager->getAll();
+    ActorSpritesConstIterator it, it_end;
+    for (it = actors.begin(), it_end = actors.end(); it != it_end; it++)
     {
-        const Being *being = *i;
+        const ActorSprite *actor = *it;
 
-        if (being->getTileX() == x && being->getTileY() == y)
+        if (actor->getTileX() == x && actor->getTileY() == y &&
+            actor->getType() != ActorSprite::FLOOR_ITEM)
             return true;
     }
 
@@ -550,15 +617,15 @@ MetaTile *Map::getMetaTile(int x, int y) const
     return &mMetaTiles[x + y * mWidth];
 }
 
-MapSprite Map::addSprite(Sprite *sprite)
+Actors::iterator Map::addActor(Actor *actor)
 {
-    mSprites.push_front(sprite);
-    return mSprites.begin();
+    mActors.push_front(actor);
+    return mActors.begin();
 }
 
-void Map::removeSprite(MapSprite iterator)
+void Map::removeActor(Actors::iterator iterator)
 {
-    mSprites.erase(iterator);
+    mActors.erase(iterator);
 }
 
 const std::string Map::getMusicFile() const
@@ -695,6 +762,7 @@ Path Map::findPixelPath(int startPixelX, int startPixelY, int endPixelX,
 Path Map::findPath(int startX, int startY, int destX, int destY,
                    unsigned char walkmask, int maxCost)
 {
+    // The basic walking cost of a tile.
     static int const basicCost = 100;
 
     // Path to be built up (empty by default)
@@ -726,9 +794,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY,
         // If the tile is already on the closed list, this means it has already
         // been processed with a shorter path to the start point (lower G cost)
         if (curr.tile->whichList == mOnClosedList)
-        {
             continue;
-        }
 
         // Put the current tile on the closed list
         curr.tile->whichList = mOnClosedList;
@@ -745,9 +811,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY,
                 // Skip if if we're checking the same tile we're leaving from,
                 // or if the new location falls outside of the map boundaries
                 if ((dx == 0 && dy == 0) || !contains(x, y))
-                {
                     continue;
-                }
 
                 MetaTile *newTile = getMetaTile(x, y);
 
@@ -767,7 +831,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY,
                     MetaTile *t1 = getMetaTile(curr.x, curr.y + dy);
                     MetaTile *t2 = getMetaTile(curr.x + dx, curr.y);
 
-                    if ((t1->blockmask | t2->blockmask) & BLOCKMASK_WALL)
+                    if ((t1->blockmask | t2->blockmask) & walkmask)
                         continue;
                 }
 
@@ -791,7 +855,9 @@ Path Map::findPath(int startX, int startY, int destX, int destY,
 
                 // It costs extra to walk through a being (needs to be enough
                 // to make it more attractive to walk around).
-                if (occupied(x, y))
+                // N.B.: Specific to TmwAthena for now.
+                if (Net::getNetworkType() == ServerInfo::TMWATHENA &&
+                    occupied(x, y))
                 {
                     Gcost += 3 * basicCost;
                 }
@@ -856,8 +922,22 @@ Path Map::findPath(int startX, int startY, int destX, int destY,
 
     // Two new values to indicate whether a tile is on the open or closed list,
     // this way we don't have to clear all the values between each pathfinding.
-    mOnClosedList += 2;
-    mOnOpenList += 2;
+    if (mOnOpenList > UINT_MAX - 2)
+    {
+        // We reset the list memebers value.
+        mOnClosedList = 1;
+        mOnOpenList = 2;
+
+        // Clean up the metaTiles
+        const int size = mWidth * mHeight;
+        for (int i = 0; i < size; ++i)
+            mMetaTiles[i].whichList = 0;
+    }
+    else
+    {
+        mOnClosedList += 2;
+        mOnOpenList += 2;
+    }
 
     // If a path has been found, iterate backwards using the parent locations
     // to extract it.
@@ -897,7 +977,7 @@ void Map::initializeParticleEffects(Particle *particleEngine)
 {
     Particle *p;
 
-    if (config.getValue("particleeffects", 1))
+    if (config.getBoolValue("particleeffects"))
     {
         for (std::list<ParticleEffectData>::iterator i = particleEffects.begin();
              i != particleEffects.end();
diff --git a/src/map.h b/src/map.h
index 9fc32232..22ca68c4 100644
--- a/src/map.h
+++ b/src/map.h
@@ -22,6 +22,7 @@
 #ifndef MAP_H
 #define MAP_H
 
+#include "actor.h"
 #include "position.h"
 #include "properties.h"
 
@@ -31,16 +32,12 @@
 class Animation;
 class AmbientLayer;
 class Graphics;
-class Image;
 class MapLayer;
 class Particle;
 class SimpleAnimation;
-class Sprite;
 class Tileset;
 
 typedef std::vector<Tileset*> Tilesets;
-typedef std::list<Sprite*> MapSprites;
-typedef MapSprites::iterator MapSprite;
 typedef std::vector<MapLayer*> Layers;
 
 /**
@@ -59,7 +56,7 @@ struct MetaTile
     int Fcost;               /**< Estimation of total path cost */
     int Gcost;               /**< Cost from start to this location */
     int Hcost;               /**< Estimated cost to goal */
-    int whichList;           /**< No list, open list or closed list */
+    unsigned whichList;      /**< No list, open list or closed list */
     int parentX;             /**< X coordinate of parent tile */
     int parentY;             /**< Y coordinate of parent tile */
     unsigned char blockmask; /**< Blocking properties of this tile */
@@ -91,7 +88,7 @@ class MapLayer
     public:
         /**
          * Constructor, taking layer origin, size and whether this layer is the
-         * fringe layer. The fringe layer is the layer that draws the sprites.
+         * fringe layer. The fringe layer is the layer that draws the actors.
          * There can be only one fringe layer per map.
          */
         MapLayer(int x, int y, int width, int height, bool isFringeLayer);
@@ -121,20 +118,25 @@ class MapLayer
          * expected to be in map range and will be translated to local layer
          * coordinates and clipped to the layer's dimensions.
          *
-         * The given sprites are only drawn when this layer is the fringe
+         * The given actors are only drawn when this layer is the fringe
          * layer.
          */
         void draw(Graphics *graphics,
                   int startX, int startY,
                   int endX, int endY,
                   int scrollX, int scrollY,
-                  const MapSprites &sprites,
+                  const Actors &actors,
                   int mDebugFlags) const;
 
+        bool isFringeLayer()
+        { return mIsFringeLayer; }
+
+        int getTileDrawWidth(int x1, int y1, int endX, int &width) const;
+
     private:
         int mX, mY;
         int mWidth, mHeight;
-        bool mIsFringeLayer;    /**< Whether the sprites are drawn. */
+        bool mIsFringeLayer;    /**< Whether the actors are drawn. */
         Image **mTiles;
 };
 
@@ -164,7 +166,9 @@ class Map : public Properties
         {
             MAP_NORMAL  = 0,
             MAP_DEBUG   = 1,
-            MAP_SPECIAL = 2
+            MAP_SPECIAL = 2,
+            MAP_SPECIAL2 = 3,
+            MAP_SPECIAL3 = 4
         };
 
         /**
@@ -190,7 +194,7 @@ class Map : public Properties
 
         /**
          * Draws the map to the given graphics output. This method draws all
-         * layers, sprites and overlay effects.
+         * layers, actors and overlay effects.
          *
          * TODO: For efficiency reasons, this method could take into account
          * the clipping rectangle set on the Graphics object. However,
@@ -295,16 +299,6 @@ class Map : public Properties
                       unsigned char walkmask, int maxCost = 20);
 
         /**
-         * Adds a sprite to the map.
-         */
-        MapSprite addSprite(Sprite *sprite);
-
-        /**
-         * Removes a sprite from the map.
-         */
-        void removeSprite(MapSprite iterator);
-
-        /**
          * Adds a particle effect
          */
         void addParticleEffect(const std::string &effectFile, int x, int y, int w = 0, int h = 0);
@@ -329,6 +323,19 @@ class Map : public Properties
          */
         TileAnimation *getAnimationForGid(int gid) const;
 
+    protected:
+        friend class Actor;
+
+        /**
+         * Adds an actor to the map.
+         */
+        Actors::iterator addActor(Actor *actor);
+
+        /**
+         * Removes an actor from the map.
+         */
+        void removeActor(Actors::iterator iterator);
+
     private:
 
         enum LayerType
@@ -356,7 +363,7 @@ class Map : public Properties
         /**
          * Blockmasks for different entities
          */
-        int *mOccupation[NB_BLOCKTYPES];
+        unsigned *mOccupation[NB_BLOCKTYPES];
 
         int mWidth, mHeight;
         int mTileWidth, mTileHeight;
@@ -364,13 +371,13 @@ class Map : public Properties
         MetaTile *mMetaTiles;
         Layers mLayers;
         Tilesets mTilesets;
-        MapSprites mSprites;
+        Actors mActors;
 
         // debug flags
         int mDebugFlags;
 
         // Pathfinding members
-        int mOnClosedList, mOnOpenList;
+        unsigned mOnClosedList, mOnOpenList;
 
         // Overlay data
         std::list<AmbientLayer*> mBackgrounds;
diff --git a/src/monster.cpp b/src/monster.cpp
deleted file mode 100644
index ca156821..00000000
--- a/src/monster.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "monster.h"
-
-#include "animatedsprite.h"
-#include "client.h"
-#include "localplayer.h"
-#include "particle.h"
-#include "sound.h"
-#include "text.h"
-
-#include "gui/userpalette.h"
-
-#include "net/net.h"
-
-#include "resources/monsterdb.h"
-#include "resources/monsterinfo.h"
-#include "configuration.h"
-
-Monster::Monster(int id, int subtype, Map *map):
-    Being(id, subtype, map),
-    mAttackType(1)
-{
-    setSubtype(subtype);
-
-    mNameColor = &userPalette->getColor(UserPalette::MONSTER);
-    mTextColor = &userPalette->getColor(UserPalette::MONSTER);
-
-    Being::setName(getInfo().getName());
-}
-
-void Monster::logic()
-{
-    if ((Net::getNetworkType() == ServerInfo::TMWATHENA) && (mAction != STAND))
-    {
-        mFrame = (int) ((get_elapsed_time(mWalkTime) * 4) / getWalkSpeed().x);
-
-        if (mFrame >= 4 && mAction != DEAD)
-            nextTile();
-    }
-
-    Being::logic();
-}
-
-
-void Monster::setAction(Action action, int attackType)
-{
-    SpriteAction currentAction = ACTION_INVALID;
-    int rotation = 0;
-    std::string particleEffect;
-
-    switch (action)
-    {
-        case WALK:
-            currentAction = ACTION_WALK;
-            break;
-        case DEAD:
-            currentAction = ACTION_DEAD;
-            sound.playSfx(getInfo().getSound(MONSTER_EVENT_DIE));
-            break;
-        case ATTACK:
-            mAttackType = attackType;
-            currentAction = getInfo().getAttackAction(attackType);
-            for (SpriteIterator it = mSprites.begin(); it != mSprites.end(); it++)
-                (*it)->reset();
-
-            //attack particle effect
-            particleEffect = getInfo().getAttackParticleEffect(attackType);
-            if (!particleEffect.empty() && Particle::enabled)
-            {
-                switch (mSpriteDirection)
-                {
-                    case DIRECTION_DOWN: rotation = 0; break;
-                    case DIRECTION_LEFT: rotation = 90; break;
-                    case DIRECTION_UP: rotation = 180; break;
-                    case DIRECTION_RIGHT: rotation = 270; break;
-                    default: break;
-                }
-                Particle *p;
-                p = particleEngine->addEffect(particleEffect, 0, 0, rotation);
-                controlParticle(p);
-            }
-            break;
-        case STAND:
-           currentAction = ACTION_STAND;
-           break;
-        case HURT:
-           // Not implemented yet
-           break;
-        case SIT:
-           // Also not implemented yet
-           break;
-    }
-
-    if (currentAction != ACTION_INVALID)
-    {
-        for (SpriteIterator it = mSprites.begin(); it != mSprites.end(); it++)
-            if (*it)
-                (*it)->play(currentAction);
-        mAction = action;
-    }
-}
-
-void Monster::setSubtype(Uint16 subtype)
-{
-    Being::setSubtype(subtype);
-
-    const MonsterInfo &info = getInfo();
-
-    // Setup Monster sprites
-    const std::list<std::string> &sprites = info.getSprites();
-
-    mSprites.clear();
-    for (std::list<std::string>::const_iterator i = sprites.begin();
-         i != sprites.end(); i++)
-    {
-        std::string file = paths.getValue("sprites",
-                                          "graphics/sprites/") + *i;
-        mSprites.push_back(AnimatedSprite::load(file));
-    }
-
-    // Ensure that something is shown
-    if (mSprites.size() == 0)
-    {
-        mSprites.push_back(AnimatedSprite::load(
-                              paths.getValue("sprites", "graphics/sprites/") +
-                              paths.getValue("spriteErrorFile", "error.xml") ));
-    }
-
-    if (Particle::enabled)
-    {
-        const std::list<std::string> &particleEffects = info.getParticleEffects();
-        for (std::list<std::string>::const_iterator i = particleEffects.begin();
-             i != particleEffects.end(); i++)
-        {
-            controlParticle(particleEngine->addEffect((*i), 0, 0));
-        }
-    }
-}
-
-void Monster::handleAttack(Being *victim, int damage, AttackType type)
-{
-    Being::handleAttack(victim, damage, type);
-
-    const MonsterInfo &mi = getInfo();
-    sound.playSfx(mi.getSound((damage > 0) ?
-                MONSTER_EVENT_HIT : MONSTER_EVENT_MISS));
-
-    fireMissile(victim, mi.getAttackMissileParticle(mAttackType));
-}
-
-void Monster::takeDamage(Being *attacker, int amount, AttackType type)
-{
-    if (amount > 0)
-        sound.playSfx(getInfo().getSound(MONSTER_EVENT_HURT));
-
-    Being::takeDamage(attacker, amount, type);
-}
-
-Being::TargetCursorSize Monster::getTargetCursorSize() const
-{
-    return getInfo().getTargetCursorSize();
-}
-
-const MonsterInfo &Monster::getInfo() const
-{
-    return MonsterDB::get(mSubType);
-}
-
-void Monster::updateCoords()
-{
-    if (mDispName)
-    {
-        mDispName->adviseXY(getPixelX(),
-                        getPixelY() - getHeight() - mDispName->getHeight());
-    }
-}
-
-void Monster::showName()
-{
-    Being::showName();
-
-    updateCoords();
-}
diff --git a/src/monster.h b/src/monster.h
deleted file mode 100644
index 9bb8e3b9..00000000
--- a/src/monster.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MONSTER_H
-#define MONSTER_H
-
-#include "being.h"
-
-class MonsterInfo;
-class Text;
-
-class Monster : public Being
-{
-    public:
-        Monster(int id, int subtype, Map *map);
-
-        virtual void logic();
-
-        virtual void setAction(Action action, int attackType = 0);
-
-        virtual Type getType() const { return MONSTER; }
-
-        virtual void setSubtype(Uint16 subtype);
-
-        virtual TargetCursorSize
-        getTargetCursorSize() const;
-
-        /**
-         * Handles an attack of another being by this monster. Plays a hit or
-         * miss sound when appropriate.
-         *
-         * @param victim the victim being
-         * @param damage the amount of damage dealt (0 means miss)
-         * @param type the attack type
-         */
-        virtual void handleAttack(Being *victim, int damage, AttackType type);
-
-        /**
-         * Puts a damage bubble above this monster and plays the hurt sound
-         *
-         * @param attacker the attacking being
-         * @param damage the amount of damage recieved (0 means miss)
-         * @param type the attack type
-         */
-        virtual void takeDamage(Being *attacker, int amount, AttackType type);
-
-        /**
-         * Returns the MonsterInfo, with static data about this monster.
-         */
-        const MonsterInfo& getInfo() const;
-
-        /**
-         * Gets the way the monster is blocked by other objects
-         */
-        virtual unsigned char getWalkMask() const
-        {
-            return Map::BLOCKMASK_WALL
-                    | Map::BLOCKMASK_CHARACTER
-                    | Map::BLOCKMASK_MONSTER;
-        }
-
-    protected:
-        /**
-         * Gets the way the monster blocks pathfinding for other objects
-         */
-        virtual Map::BlockType getBlockType() const
-        { return Map::BLOCKTYPE_MONSTER; }
-
-        /**
-         * Update the text when the monster moves
-         */
-        void updateCoords();
-
-        void showName();
-
-    private:
-        int mAttackType;
-};
-
-#endif
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index 23e9abc0..3ed96dbd 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -29,6 +29,8 @@ namespace Net {
 class AdminHandler
 {
     public:
+        virtual ~AdminHandler() {}
+
         virtual void announce(const std::string &text) = 0;
 
         virtual void localAnnounce(const std::string &text) = 0;
@@ -49,8 +51,6 @@ class AdminHandler
 
         virtual void mute(int playerId, int type, int limit) = 0;
 
-        virtual ~AdminHandler() {}
-
         // TODO
 };
 
diff --git a/src/net/charhandler.h b/src/net/charhandler.h
index 4a813e21..0694e39e 100644
--- a/src/net/charhandler.h
+++ b/src/net/charhandler.h
@@ -23,14 +23,13 @@
 #define CHARHANDLER_H
 
 #include "localplayer.h"
-#include "logindata.h"
+#include "playerinfo.h"
 
 #include <iosfwd>
 #include <vector>
 
 class CharCreateDialog;
 class CharSelectDialog;
-class LocalPlayer;
 
 namespace Net {
 
@@ -41,7 +40,7 @@ struct Character
 {
     Character() :
         slot(0),
-        dummy(new LocalPlayer)
+        dummy(0)
     {
     }
 
@@ -52,6 +51,7 @@ struct Character
 
     int slot;            /**< The index in the list of characters */
     LocalPlayer *dummy;  /**< A dummy representing this character */
+    PlayerInfoBackend data;
 };
 
 typedef std::list<Character*> Characters;
@@ -59,6 +59,8 @@ typedef std::list<Character*> Characters;
 class CharHandler
 {
     public:
+        virtual ~CharHandler() {}
+
         virtual void setCharSelectDialog(CharSelectDialog *window) = 0;
 
         virtual void setCharCreateDialog(CharCreateDialog *window) = 0;
@@ -75,13 +77,11 @@ class CharHandler
 
         virtual void switchCharacter() = 0;
 
-        virtual int baseSprite() const = 0;
+        virtual unsigned int baseSprite() const = 0;
 
-        virtual int hairSprite() const = 0;
+        virtual unsigned int hairSprite() const = 0;
 
-        virtual int maxSprite() const = 0;
-
-        virtual ~CharHandler() {}
+        virtual unsigned int maxSprite() const = 0;
 
     protected:
         CharHandler():
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index d1449698..fbaa8dba 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -28,6 +28,8 @@ namespace Net {
 class ChatHandler
 {
     public:
+        virtual ~ChatHandler() {}
+
         virtual void talk(const std::string &text) = 0;
 
         virtual void me(const std::string &text) = 0;
@@ -53,8 +55,6 @@ class ChatHandler
         virtual void kickUser(int channelId, const std::string &name) = 0;
 
         virtual void who() = 0;
-
-        virtual ~ChatHandler() {}
 };
 }
 
diff --git a/src/net/download.cpp b/src/net/download.cpp
index a2cd4910..83ab180f 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -221,8 +221,8 @@ int Download::downloadThread(void *ptr)
             }
 
             curl_easy_setopt(d->mCurl, CURLOPT_USERAGENT,
-                             strprintf(PACKAGE_EXTENDED_VERSION, branding
-                             .getValue("appShort", "mana").c_str()).c_str());
+                             strprintf(PACKAGE_EXTENDED_VERSION,
+                          branding.getStringValue("appShort").c_str()).c_str());
             curl_easy_setopt(d->mCurl, CURLOPT_ERRORBUFFER, d->mError);
             curl_easy_setopt(d->mCurl, CURLOPT_URL, d->mUrl.c_str());
             curl_easy_setopt(d->mCurl, CURLOPT_NOPROGRESS, 0);
diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h
index 774de16c..0c5d889f 100644
--- a/src/net/gamehandler.h
+++ b/src/net/gamehandler.h
@@ -22,8 +22,6 @@
 #ifndef MAPHANDLER_H
 #define MAPHANDLER_H
 
-#include "logindata.h"
-
 #include <iosfwd>
 
 namespace Net {
@@ -31,16 +29,14 @@ namespace Net {
 class GameHandler
 {
     public:
+        virtual ~GameHandler() {}
+
         virtual void connect() = 0;
 
         virtual bool isConnected() = 0;
 
         virtual void disconnect() = 0;
 
-        virtual void inGame() = 0;
-
-        virtual void mapLoaded(const std::string &mapName) = 0;
-
         virtual void who() = 0;
 
         virtual void quit() = 0;
@@ -49,7 +45,10 @@ class GameHandler
 
         virtual bool removeDeadBeings() const = 0;
 
-        virtual ~GameHandler() {}
+        /**
+         * Tells whether the protocol is using the MP status bar
+         */
+        virtual bool canUseMagicBar() const = 0;
 };
 
 } // namespace Net
diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h
index 222b430a..4b8474dd 100644
--- a/src/net/generalhandler.h
+++ b/src/net/generalhandler.h
@@ -19,9 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "client.h"
-#include "main.h"
-
 #ifndef GENERALHANDLER_H
 #define GENERALHANDLER_H
 
@@ -40,13 +37,7 @@ class GeneralHandler
 
         virtual void flushNetwork() = 0;
 
-        virtual void guiWindowsLoaded() = 0;
-
-        virtual void guiWindowsUnloaded() = 0;
-
         virtual void clearHandlers() = 0;
-
-        virtual void stateChanged(State oldState, State newState) = 0;
 };
 
 } // namespace Net
diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h
index 1696b2d5..e4513cbb 100644
--- a/src/net/guildhandler.h
+++ b/src/net/guildhandler.h
@@ -23,10 +23,11 @@
 #define GUILDHANDLER_H
 
 #include "guild.h"
-#include "player.h"
 
 #include <iosfwd>
 
+class Being;
+
 namespace Net {
 
 class GuildHandler
@@ -40,7 +41,7 @@ class GuildHandler
 
         virtual void invite(int guildId, const std::string &name) = 0;
 
-        virtual void invite(int guildId, Player *player) = 0;
+        virtual void invite(int guildId, Being *being) = 0;
 
         virtual void inviteResponse(int guildId, bool response) = 0;
 
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index e48043a7..93b56a40 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -32,33 +32,12 @@ namespace Net {
 class InventoryHandler
 {
     public:
-        virtual void equipItem(const Item *item) = 0;
-
-        virtual void unequipItem(const Item *item) = 0;
-
-        virtual void useItem(const Item *item) = 0;
-
-        virtual void dropItem(const Item *item, int amount) = 0;
+        virtual ~InventoryHandler() {}
 
         virtual bool canSplit(const Item *item) = 0;
 
-        virtual void splitItem(const Item *item, int amount) = 0;
-
-        virtual void moveItem(int oldIndex, int newIndex) = 0;
-
-        virtual void openStorage(int type) = 0;
-
-        virtual void closeStorage(int type) = 0;
-
-        //void changeCart() = 0;
-
-        virtual void moveItem(int source, int slot, int amount,
-                              int destination) = 0;
-
         // TODO: fix/remove me
         virtual size_t getSize(int type) const = 0;
-
-        virtual ~InventoryHandler() {}
 };
 
 } // namespace Net
diff --git a/src/net/logindata.h b/src/net/logindata.h
index 9bbeed4f..4a1c1a9f 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -22,15 +22,21 @@
 #ifndef LOGINDATA_H
 #define LOGINDATA_H
 
-#include "player.h"
-
-#include "net/serverinfo.h"
+#include "being.h"
 
 #include <string>
 
 class LoginData
 {
 public:
+    /**
+     * Constructor
+     */
+    LoginData()
+    {
+        resetCharacterSlots();
+    }
+
     std::string username;
     std::string password;
     std::string newPassword;
@@ -44,6 +50,16 @@ public:
     bool remember;            /**< Whether to store the username. */
     bool registerLogin;       /**< Whether an account is being registered. */
 
+    unsigned short characterSlots; /**< The number of character slots */
+
+    /**
+     * Initialize character slots to 3 for TmwAthena compatibility
+     */
+    void resetCharacterSlots()
+    {
+      characterSlots = 3; // Default value, used for TmwAthena.
+    }
+
     void clear()
     {
         username.clear();
@@ -53,6 +69,7 @@ public:
         email.clear();
         captchaResponse.clear();
         gender = GENDER_UNSPECIFIED;
+        resetCharacterSlots();
     }
 };
 
diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp
index 8a30e01b..db6c22ed 100644
--- a/src/net/manaserv/adminhandler.cpp
+++ b/src/net/manaserv/adminhandler.cpp
@@ -23,7 +23,7 @@
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 extern Net::AdminHandler *adminHandler;
 
diff --git a/src/net/manaserv/attributes.cpp b/src/net/manaserv/attributes.cpp
new file mode 100644
index 00000000..e57c6278
--- /dev/null
+++ b/src/net/manaserv/attributes.cpp
@@ -0,0 +1,408 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/manaserv/attributes.h"
+
+#include "log.h"
+#include "playerinfo.h"
+
+#include "gui/statuswindow.h"
+
+#include "resources/itemdb.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+#include "utils/xml.h"
+
+#include <list>
+#include <map>
+
+#define DEFAULT_ATTRIBUTESDB_FILE "attributes.xml"
+#define DEFAULT_POINTS 60
+#define DEFAULT_MIN_PTS 1
+#define DEFAULT_MAX_PTS 20
+
+namespace ManaServ {
+namespace Attributes {
+
+    typedef struct
+    {
+        unsigned int id;
+        std::string name;
+        std::string description;
+        /** Whether the attribute value can be modified by the player */
+        bool modifiable;
+        /**< Attribute scope. */
+        std::string scope;
+        /** The playerInfo core Id the attribute is linked with or -1 if not */
+        int playerInfoId;
+    } Attribute;
+
+    /** Map for attributes. */
+    typedef std::map<unsigned int, Attribute> AttributeMap;
+    static AttributeMap attributes;
+
+    /** tags = effects on attributes. */
+    typedef std::map< std::string, std::string > TagMap;
+    static TagMap tags;
+
+    /** List of modifiable attribute names used at character's creation. */
+    static std::vector<std::string> attributeLabels;
+
+    /** Characters creation points. */
+    static unsigned int creationPoints = 0;
+    static unsigned int attributeMinimum = 0;
+    static unsigned int attributeMaximum = 0;
+
+    unsigned int getCreationPoints()
+    {
+        return creationPoints;
+    }
+
+    unsigned int getAttributeMinimum()
+    {
+        return attributeMinimum;
+    }
+
+    unsigned int getAttributeMaximum()
+    {
+        return attributeMaximum;
+    }
+
+    std::vector<std::string>& getLabels()
+    {
+        return attributeLabels;
+    }
+
+    /**
+     * Fills the list of base attribute labels.
+     */
+    static void fillLabels()
+    {
+        // Fill up the modifiable attribute label list.
+        attributeLabels.clear();
+        AttributeMap::const_iterator it, it_end;
+        for (it = attributes.begin(), it_end = attributes.end(); it != it_end;
+                                                                           it++)
+        {
+            if (it->second.modifiable &&
+               (it->second.scope == "character" || it->second.scope == "being"))
+                attributeLabels.push_back(it->second.name + ":");
+        }
+    }
+
+    /**
+     * Fills the list of base attribute labels.
+     */
+    static int getPlayerInfoIdFromAttrType(std::string attrType)
+    {
+        toLower(attrType);
+        if (attrType == "level")
+            return ::LEVEL;
+        else if (attrType == "hp")
+            return ::HP;
+        else if (attrType == "max-hp")
+            return ::MAX_HP;
+        else if (attrType == "mp")
+            return ::MP;
+        else if (attrType == "max-mp")
+            return ::MAX_MP;
+        else if (attrType == "exp")
+            return ::EXP;
+        else if (attrType == "exp-needed")
+            return ::EXP_NEEDED;
+        else if (attrType == "money")
+            return ::MONEY;
+        else if (attrType == "total-weight")
+            return ::TOTAL_WEIGHT;
+        else if (attrType == "max-weight")
+            return ::MAX_WEIGHT;
+        else if (attrType == "skill-points")
+            return ::SKILL_POINTS;
+        else if (attrType == "char-points")
+            return ::CHAR_POINTS;
+        else if (attrType == "corr-points")
+            return ::CORR_POINTS;
+        else if (attrType == "none")
+            return -2; // Used to hide the attribute display.
+
+        return -1; // Not linked to a playerinfo stat.
+    }
+
+    int getPlayerInfoIdFromAttrId(int attrId)
+    {
+        AttributeMap::const_iterator it = attributes.find(attrId);
+
+        if (it != attributes.end())
+        {
+            return it->second.playerInfoId;
+        }
+
+        return -1;
+    }
+
+    static void loadBuiltins()
+    {
+        {
+            Attribute a;
+            a.id = 16;
+            a.name = _("Strength");
+            a.description = "";
+            a.modifiable = true;
+            a.scope = "character";
+            a.playerInfoId = -1;
+
+            attributes[a.id] = a;
+            tags.insert(std::make_pair("str", _("Strength %+.1f")));
+        }
+
+        {
+            Attribute a;
+            a.id = 17;
+            a.name = _("Agility");
+            a.description = "";
+            a.modifiable = true;
+            a.scope = "character";
+            a.playerInfoId = -1;
+
+            attributes[a.id] = a;
+            tags.insert(std::make_pair("agi", _("Agility %+.1f")));
+        }
+
+        {
+            Attribute a;
+            a.id = 18;
+            a.name = _("Dexterity");
+            a.description = "";
+            a.modifiable = true;
+            a.scope = "character";
+            a.playerInfoId = -1;
+
+            attributes[a.id] = a;
+            tags.insert(std::make_pair("dex", _("Dexterity %+.1f")));
+        }
+
+        {
+            Attribute a;
+            a.id = 19;
+            a.name = _("Vitality");
+            a.description = "";
+            a.modifiable = true;
+            a.scope = "character";
+            a.playerInfoId = -1;
+
+            attributes[a.id] = a;
+            tags.insert(std::make_pair("vit", _("Vitality %+.1f")));
+        }
+
+        {
+            Attribute a;
+            a.id = 20;
+            a.name = _("Intelligence");
+            a.description = "";
+            a.modifiable = true;
+            a.scope = "character";
+            a.playerInfoId = -1;
+
+            attributes[a.id] = a;
+            tags.insert(std::make_pair("int", _("Intelligence %+.1f")));
+        }
+
+        {
+            Attribute a;
+            a.id = 21;
+            a.name = _("Willpower");
+            a.description = "";
+            a.modifiable = true;
+            a.scope = "character";
+            a.playerInfoId = -1;
+
+            attributes[a.id] = a;
+            tags.insert(std::make_pair("wil", _("Willpower %+.1f")));
+        }
+    }
+
+    void load()
+    {
+        logger->log("Initializing attributes database...");
+
+        XML::Document doc(DEFAULT_ATTRIBUTESDB_FILE);
+        xmlNodePtr rootNode = doc.rootNode();
+
+        if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "attributes"))
+        {
+            logger->log("Attributes: Error while loading "
+                        DEFAULT_ATTRIBUTESDB_FILE ". Using Built-ins.");
+            loadBuiltins();
+            fillLabels();
+            return;
+        }
+
+        for_each_xml_child_node(node, rootNode)
+        {
+            if (xmlStrEqual(node->name, BAD_CAST "attribute"))
+            {
+                int id = XML::getProperty(node, "id", 0);
+
+                if (!id)
+                {
+                    logger->log("Attributes: Invalid or missing stat ID in "
+                                DEFAULT_ATTRIBUTESDB_FILE "!");
+                    continue;
+                }
+                else if (attributes.find(id) != attributes.end())
+                {
+                    logger->log("Attributes: Redefinition of stat ID %d", id);
+                }
+
+                std::string name = XML::getProperty(node, "name", "");
+
+                if (name.empty())
+                {
+                    logger->log("Attributes: Invalid or missing stat name in "
+                                DEFAULT_ATTRIBUTESDB_FILE "!");
+                    continue;
+                }
+
+                // Create the attribute.
+                Attribute a;
+                a.id = id;
+                a.name = name;
+                a.description = XML::getProperty(node, "desc", "");
+                a.modifiable = XML::getBoolProperty(node, "modifiable", false);
+                a.scope = XML::getProperty(node, "scope", "none");
+                a.playerInfoId = getPlayerInfoIdFromAttrType(
+                                 XML::getProperty(node, "player-info", ""));
+
+                attributes[id] = a;
+
+                unsigned int count = 0;
+                for_each_xml_child_node(effectNode, node)
+                 {
+                    if (!xmlStrEqual(effectNode->name, BAD_CAST "modifier"))
+                         continue;
+                    ++count;
+                    std::string tag = XML::getProperty(effectNode, "tag", "");
+                    if (tag.empty())
+                    {
+                        if (name.empty())
+                        {
+                            logger->log("Attribute modifier in attribute %u:%s: "
+                                        "Empty name definition "
+                                        "on empty tag definition, skipping.",
+                                        a.id, a.name.c_str());
+                            --count;
+                            continue;
+                        }
+                        tag = name.substr(0, name.size() > 3 ? 3 : name.size());
+                        tag = toLower(tag) + toString(count);
+                     }
+
+                    std::string effect = XML::getProperty(effectNode, "effect", "");
+                    if (effect.empty())
+                     {
+                        if (name.empty())
+                        {
+                            logger->log("Attribute modifier in attribute %u:%s: "
+                                        "Empty name definition "
+                                        "on empty effect definition, skipping.",
+                                        a.id, a.name.c_str());
+                            --count;
+                            continue;
+                        }
+                        else
+                            effect = name + " %+f";
+                     }
+                    tags.insert(std::make_pair(tag, effect));
+                 }
+                logger->log("Found %d tags for attribute %d.", count, id);
+
+            }// End attribute
+            else if (xmlStrEqual(node->name, BAD_CAST "points"))
+            {
+                creationPoints = XML::getProperty(node, "start",DEFAULT_POINTS);
+                attributeMinimum = XML::getProperty(node, "minimum",
+                                                               DEFAULT_MIN_PTS);
+                attributeMaximum = XML::getProperty(node, "maximum",
+                                                               DEFAULT_MAX_PTS);
+                logger->log("Loaded points: start: %i, min: %i, max: %i.",
+                            creationPoints, attributeMinimum, attributeMaximum);
+            }
+            else
+            {
+                continue;
+            }
+        }
+        logger->log("Found %d tags for %d attributes.", int(tags.size()),
+                                                        int(attributes.size()));
+
+        fillLabels();
+
+        // Sanity checks on starting points
+        float modifiableAttributeCount = (float) attributeLabels.size();
+        float averageValue = ((float) creationPoints) / modifiableAttributeCount;
+        if (averageValue > attributeMaximum || averageValue < attributeMinimum
+            || creationPoints < 1)
+        {
+            logger->log("Attributes: Character's point values make "
+                        "the character's creation impossible. "
+                        "Switch back to defaults.");
+            creationPoints = DEFAULT_POINTS;
+            attributeMinimum = DEFAULT_MIN_PTS;
+            attributeMaximum = DEFAULT_MAX_PTS;
+        }
+    }
+
+    void unload()
+    {
+        attributes.clear();
+    }
+
+    void informItemDB()
+    {
+        std::list<ItemStat> dbStats;
+
+        TagMap::const_iterator it, it_end;
+        for (it = tags.begin(), it_end = tags.end(); it != it_end; ++it)
+            dbStats.push_back(ItemStat(it->first,
+                                           it->second));
+
+        setStatsList(dbStats);
+    }
+
+    void informStatusWindow()
+    {
+        AttributeMap::const_iterator it, it_end;
+        for (it = attributes.begin(), it_end = attributes.end(); it != it_end;
+                                                                           it++)
+        {
+            if (it->second.playerInfoId == -1 &&
+                (it->second.scope == "character" || it->second.scope == "being"))
+            {
+                statusWindow->addAttribute(it->second.id,
+                                           it->second.name,
+                                           it->second.modifiable,
+                                           it->second.description);
+            }
+        }
+    }
+
+} // namespace Attributes
+} // namespace ManaServ
diff --git a/src/net/manaserv/attributes.h b/src/net/manaserv/attributes.h
new file mode 100644
index 00000000..aced85ec
--- /dev/null
+++ b/src/net/manaserv/attributes.h
@@ -0,0 +1,70 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_MANASERV_ATTRIBUTES_H
+#define NET_MANASERV_ATTRIBUTES_H
+
+#include <string>
+#include <vector>
+
+namespace ManaServ {
+namespace Attributes {
+
+    void load();
+
+    void unload();
+
+    void informItemDB();
+
+    void informStatusWindow();
+
+    /**
+     * Returns the list of base attribute labels.
+     */
+    std::vector<std::string>& getLabels();
+
+    /**
+     * Give back the corresponding playerinfo Id from the attribute id
+     * defined in the xml file.
+     */
+    int getPlayerInfoIdFromAttrId(int attrId);
+
+    /**
+     * Give the attribute points given to a character
+     * at its creation.
+     */
+    unsigned int getCreationPoints();
+
+    /**
+     * Give the minimum attribute point possible
+     * at character's creation.
+     */
+    unsigned int getAttributeMinimum();
+
+    /**
+     * Give the maximum attribute point possible
+     * at character's creation.
+     */
+    unsigned int getAttributeMaximum();
+
+} // namespace Attributes
+} // namespace ManaServ
+
+#endif // NET_MANASERV_ATTRIBUTES_H
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index 8df9a8ab..6e9b3645 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -21,13 +21,12 @@
 
 #include "net/manaserv/beinghandler.h"
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
 #include "client.h"
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
-#include "npc.h"
 #include "particle.h"
 
 #include "gui/okdialog.h"
@@ -35,7 +34,7 @@
 #include "net/messagein.h"
 
 #include "net/manaserv/playerhandler.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 #include "resources/colordb.h"
 
@@ -121,7 +120,7 @@ Vector BeingHandler::giveSpeedInPixelsPerTicks(float speedInTilesPerSeconds)
     return speedInTicks;
 }
 
-static void handleLooks(Player *being, Net::MessageIn &msg)
+static void handleLooks(Being *being, Net::MessageIn &msg)
 {
     // Order of sent slots. Has to be in sync with the server code.
     static int const nb_slots = 4;
@@ -145,7 +144,7 @@ static void handleLooks(Player *being, Net::MessageIn &msg)
     {
         if (!(mask & (1 << i))) continue;
         int id = msg.readInt16();
-        being->setSprite(slots[i], id);
+        being->setSprite(slots[i], id,"", (slots[i] == SPRITE_WEAPON));
     }
 }
 
@@ -156,6 +155,7 @@ void BeingHandler::handleBeingEnterMessage(Net::MessageIn &msg)
     Being::Action action = (Being::Action)msg.readInt8();
     int px = msg.readInt16();
     int py = msg.readInt16();
+    BeingDirection direction = (BeingDirection)msg.readInt8();
     Being *being;
 
     switch (type)
@@ -170,23 +170,23 @@ void BeingHandler::handleBeingEnterMessage(Net::MessageIn &msg)
             }
             else
             {
-                being = beingManager->createBeing(id, Being::PLAYER, 0);
+                being = actorSpriteManager->createBeing(id,
+                                                    ActorSprite::PLAYER, 0);
                 being->setName(name);
             }
-            Player *p = static_cast< Player * >(being);
             int hs = msg.readInt8(), hc = msg.readInt8();
-            p->setSprite(SPRITE_HAIR, hs * -1, ColorDB::get(hc));
-            p->setGender(msg.readInt8() == GENDER_MALE ?
-                    GENDER_MALE : GENDER_FEMALE);
-            handleLooks(p, msg);
+            being->setSprite(SPRITE_HAIR, hs * -1, ColorDB::get(hc));
+            being->setGender(msg.readInt8() == GENDER_MALE ?
+                             GENDER_MALE : GENDER_FEMALE);
+            handleLooks(being, msg);
         } break;
 
         case OBJECT_MONSTER:
         case OBJECT_NPC:
         {
             int subtype = msg.readInt16();
-            being = beingManager->createBeing(id, type == OBJECT_MONSTER ?
-                                    Being::MONSTER : Being::NPC, subtype);
+            being = actorSpriteManager->createBeing(id, type == OBJECT_MONSTER
+                           ? ActorSprite::MONSTER : ActorSprite::NPC, subtype);
             std::string name = msg.readString();
             if (name.length() > 0) being->setName(name);
         } break;
@@ -197,16 +197,17 @@ void BeingHandler::handleBeingEnterMessage(Net::MessageIn &msg)
 
     being->setPosition(px, py);
     being->setDestination(px, py);
+    being->setDirection(direction);
     being->setAction(action);
 }
 
 void BeingHandler::handleBeingLeaveMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
     if (!being)
         return;
 
-    beingManager->destroyBeing(being);
+    actorSpriteManager->destroy(being);
 }
 
 void BeingHandler::handleBeingsMoveMessage(Net::MessageIn &msg)
@@ -215,7 +216,7 @@ void BeingHandler::handleBeingsMoveMessage(Net::MessageIn &msg)
     {
         int id = msg.readInt16();
         int flags = msg.readInt8();
-        Being *being = beingManager->findBeing(id);
+        Being *being = actorSpriteManager->findBeing(id);
         int sx = 0;
         int sy = 0;
         int speed = 0;
@@ -257,20 +258,14 @@ void BeingHandler::handleBeingsMoveMessage(Net::MessageIn &msg)
 
 void BeingHandler::handleBeingAttackMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
-    const int direction = msg.readInt8();
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
+    const BeingDirection direction = (BeingDirection) msg.readInt8();
     const int attackType = msg.readInt8();
 
     if (!being)
         return;
 
-    switch (direction)
-    {
-        case DIRECTION_UP: being->setDirection(Being::UP); break;
-        case DIRECTION_DOWN: being->setDirection(Being::DOWN); break;
-        case DIRECTION_LEFT: being->setDirection(Being::LEFT); break;
-        case DIRECTION_RIGHT: being->setDirection(Being::RIGHT); break;
-    }
+    being->setDirection(direction);
 
     being->setAction(Being::ATTACK, attackType);
 }
@@ -279,7 +274,7 @@ void BeingHandler::handleBeingsDamageMessage(Net::MessageIn &msg)
 {
     while (msg.getUnreadLength())
     {
-        Being *being = beingManager->findBeing(msg.readInt16());
+        Being *being = actorSpriteManager->findBeing(msg.readInt16());
         int damage = msg.readInt16();
         if (being)
         {
@@ -290,7 +285,7 @@ void BeingHandler::handleBeingsDamageMessage(Net::MessageIn &msg)
 
 void BeingHandler::handleBeingActionChangeMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
     Being::Action action = (Being::Action) msg.readInt8();
     if (!being)
         return;
@@ -329,38 +324,28 @@ void BeingHandler::handleBeingActionChangeMessage(Net::MessageIn &msg)
 
 void BeingHandler::handleBeingLooksChangeMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
-    if (!being || being->getType() != Being::PLAYER)
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
+    if (!being || being->getType() != ActorSprite::PLAYER)
         return;
-    Player *player = static_cast<Player *>(being);
-    handleLooks(player, msg);
+    handleLooks(being, msg);
     if (msg.getUnreadLength())
     {
         int style = msg.readInt16();
         int color = msg.readInt16();
-        player->setSprite(SPRITE_HAIR, style * -1, ColorDB::get(color));
+        being->setSprite(SPRITE_HAIR, style * -1, ColorDB::get(color));
     }
 }
 
 void BeingHandler::handleBeingDirChangeMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
     if (!being)
         return;
     int data = msg.readInt8();
 
     // The direction for the player's character is handled on client side.
     if (being != player_node)
-    {
-        switch (data)
-        {
-          case DIRECTION_UP: being->setDirection(Being::UP); break;
-          case DIRECTION_DOWN: being->setDirection(Being::DOWN); break;
-          case DIRECTION_LEFT: being->setDirection(Being::LEFT); break;
-          case DIRECTION_RIGHT: being->setDirection(Being::RIGHT); break;
-          default: break;
-        }
-    }
+        being->setDirection((BeingDirection) data);
 }
 
 } // namespace ManaServ
diff --git a/src/net/manaserv/buysellhandler.cpp b/src/net/manaserv/buysellhandler.cpp
index a4ce6aa0..c375ed75 100644
--- a/src/net/manaserv/buysellhandler.cpp
+++ b/src/net/manaserv/buysellhandler.cpp
@@ -21,18 +21,16 @@
 
 #include "net/manaserv/buysellhandler.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
 #include "item.h"
-#include "localplayer.h"
-#include "npc.h"
+#include "playerinfo.h"
 
 #include "gui/buy.h"
-#include "gui/chat.h"
 #include "gui/sell.h"
 
 #include "net/messagein.h"
 
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 
 namespace ManaServ {
@@ -49,8 +47,8 @@ BuySellHandler::BuySellHandler()
 
 void BuySellHandler::handleMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
-    if (!being || being->getType() != Being::NPC)
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
+    if (!being || being->getType() != ActorSprite::NPC)
     {
         return;
     }
@@ -64,7 +62,7 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
             BuyDialog* dialog = new BuyDialog(npcId);
 
             dialog->reset();
-            dialog->setMoney(player_node->getMoney());
+            dialog->setMoney(PlayerInfo::getAttribute(MONEY));
 
             while (msg.getUnreadLength())
             {
@@ -81,7 +79,7 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
             SellDialog* dialog = new SellDialog(npcId);
 
             dialog->reset();
-            dialog->setMoney(player_node->getMoney());
+            dialog->setMoney(PlayerInfo::getAttribute(MONEY));
 
             while (msg.getUnreadLength())
             {
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index e6723226..961b364a 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -36,8 +36,8 @@
 #include "net/manaserv/gamehandler.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
-#include "net/manaserv/stats.h"
+#include "net/manaserv/manaserv_protocol.h"
+#include "net/manaserv/attributes.h"
 
 #include "resources/colordb.h"
 
@@ -108,11 +108,15 @@ void CharHandler::handleCharacterInfo(Net::MessageIn &msg)
     info.level = msg.readInt16();
     info.characterPoints = msg.readInt16();
     info.correctionPoints = msg.readInt16();
-    info.money = msg.readInt32();
 
-    for (int i = 0; i < 7; i++)
+    while (msg.getUnreadLength() > 0)
     {
-        info.attribute[i] = msg.readInt8();
+        int id = msg.readInt32();
+        CachedAttrbiute attr;
+        attr.base = msg.readInt32() / 256.0;
+        attr.mod = msg.readInt32() / 256.0;
+
+        info.attribute[id] = attr;
     }
 
     mCachedCharacterInfos.push_back(info);
@@ -157,8 +161,14 @@ void CharHandler::handleCharacterCreateResponse(Net::MessageIn &msg)
             case CREATE_ATTRIBUTES_TOO_LOW:
                 errorMessage = _("Character's stats are too low.");
                 break;
-            case CREATE_ATTRIBUTES_EQUAL_TO_ZERO:
-                errorMessage = _("One stat is zero.");
+            case CREATE_ATTRIBUTES_OUT_OF_RANGE:
+                errorMessage = strprintf( _("At least one stat"
+                                   "is out of the permitted range: (%u - %u)."),
+                                   Attributes::getAttributeMinimum(),
+                                   Attributes::getAttributeMaximum());
+                break;
+            case CREATE_INVALID_SLOT:
+                errorMessage = _("Invalid slot number.");
                 break;
             default:
                 errorMessage = _("Unknown error.");
@@ -189,7 +199,6 @@ void CharHandler::handleCharacterDeleteResponse(Net::MessageIn &msg)
         delete mSelectedCharacter;
         mCharacters.remove(mSelectedCharacter);
         updateCharSelectDialog();
-        unlockCharSelectDialog();
         new OkDialog(_("Info"), _("Player deleted."));
     }
     else
@@ -210,6 +219,7 @@ void CharHandler::handleCharacterDeleteResponse(Net::MessageIn &msg)
         new OkDialog(_("Error"), errorMessage);
     }
     mSelectedCharacter = 0;
+    unlockCharSelectDialog();
 }
 
 void CharHandler::handleCharacterSelectResponse(Net::MessageIn &msg)
@@ -233,6 +243,7 @@ void CharHandler::handleCharacterSelectResponse(Net::MessageIn &msg)
 
         // Prevent the selected local player from being deleted
         player_node = mSelectedCharacter->dummy;
+        PlayerInfo::setBackend(mSelectedCharacter->data);
         mSelectedCharacter->dummy = 0;
 
         Client::setState(STATE_CONNECT_GAME);
@@ -259,7 +270,10 @@ void CharHandler::setCharCreateDialog(CharCreateDialog *window)
     if (!mCharCreateDialog)
         return;
 
-    mCharCreateDialog->setAttributes(Stats::getLabelVector(), 60, 1, 20);
+    mCharCreateDialog->setAttributes(Attributes::getLabels(),
+                                     Attributes::getCreationPoints(),
+                                     Attributes::getAttributeMinimum(),
+                                     Attributes::getAttributeMaximum());
 }
 
 void CharHandler::requestCharacters()
@@ -285,7 +299,7 @@ void CharHandler::chooseCharacter(Net::Character *character)
 }
 
 void CharHandler::newCharacter(const std::string &name,
-                               int /* slot */,
+                               int slot,
                                bool gender,
                                int hairstyle,
                                int hairColor,
@@ -297,6 +311,7 @@ void CharHandler::newCharacter(const std::string &name,
     msg.writeInt8(hairstyle);
     msg.writeInt8(hairColor);
     msg.writeInt8(gender);
+    msg.writeInt8(slot);
 
     std::vector<int>::const_iterator it, it_end;
     for (it = stats.begin(), it_end = stats.end(); it != it_end; it++)
@@ -319,17 +334,17 @@ void CharHandler::switchCharacter()
     gameHandler->quit(true);
 }
 
-int CharHandler::baseSprite() const
+unsigned int CharHandler::baseSprite() const
 {
     return SPRITE_BASE;
 }
 
-int CharHandler::hairSprite() const
+unsigned int CharHandler::hairSprite() const
 {
     return SPRITE_HAIR;
 }
 
-int CharHandler::maxSprite() const
+unsigned int CharHandler::maxSprite() const
 {
     return SPRITE_VECTOREND;
 }
@@ -350,19 +365,20 @@ void CharHandler::updateCharacters()
 
         Net::Character *character = new Net::Character;
         character->slot = info.slot;
-        LocalPlayer *player = character->dummy;
+        LocalPlayer *player = character->dummy = new LocalPlayer;
         player->setName(info.name);
         player->setGender(info.gender);
         player->setSprite(SPRITE_HAIR, info.hairStyle * -1,
                           ColorDB::get(info.hairColor));
-        player->setLevel(info.level);
-        player->setCharacterPoints(info.characterPoints);
-        player->setCorrectionPoints(info.correctionPoints);
-        player->setMoney(info.money);
+        character->data.mAttributes[LEVEL] = info.level;
+        character->data.mAttributes[CHAR_POINTS] = info.characterPoints;
+        character->data.mAttributes[CORR_POINTS] = info.correctionPoints;
 
-        for (int i = 0; i < 7; i++)
+        for (CachedAttributes::const_iterator it = info.attribute.begin(),
+             it_end = info.attribute.end(); it != it_end; it++)
         {
-            player->setAttributeBase(i, info.attribute[i], false);
+            character->data.mStats[i].base = it->second.base;
+            character->data.mStats[i].mod = it->second.mod;
         }
 
         mCharacters.push_back(character);
diff --git a/src/net/manaserv/charhandler.h b/src/net/manaserv/charhandler.h
index 26a7bf4e..2f335688 100644
--- a/src/net/manaserv/charhandler.h
+++ b/src/net/manaserv/charhandler.h
@@ -28,6 +28,8 @@
 
 #include "net/manaserv/messagehandler.h"
 
+#include <map.h>
+
 class LoginData;
 
 namespace ManaServ {
@@ -65,11 +67,11 @@ class CharHandler : public MessageHandler, public Net::CharHandler
 
         void switchCharacter();
 
-        int baseSprite() const;
+        unsigned int baseSprite() const;
 
-        int hairSprite() const;
+        unsigned int hairSprite() const;
 
-        int maxSprite() const;
+        unsigned int maxSprite() const;
 
         void clear();
 
@@ -79,6 +81,13 @@ class CharHandler : public MessageHandler, public Net::CharHandler
          * we have loaded the dynamic data, so we can't resolve load any
          * sprites yet.
          */
+        struct CachedAttrbiute {
+            double base;
+            double mod;
+        };
+
+        typedef std::map<int, CachedAttrbiute> CachedAttributes;
+
         struct CachedCharacterInfo {
             int slot;
             std::string name;
@@ -88,8 +97,7 @@ class CharHandler : public MessageHandler, public Net::CharHandler
             int level;
             int characterPoints;
             int correctionPoints;
-            int money;
-            int attribute[7];
+            CachedAttributes attribute;
         };
 
         void handleCharacterInfo(Net::MessageIn &msg);
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index a452281f..705795f4 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -21,20 +21,21 @@
 
 #include "net/manaserv/chathandler.h"
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
 #include "client.h"
 #include "channel.h"
 #include "channelmanager.h"
-
-#include "gui/chat.h"
+#include "event.h"
+#include "log.h"
+#include "playerrelations.h"
 
 #include "gui/widgets/channeltab.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -149,22 +150,30 @@ void ChatHandler::handleGameChatMessage(Net::MessageIn &msg)
 
     if (id == 0)
     {
-        localChatTab->chatLog(chatMsg, BY_SERVER);
+        SERVER_NOTICE(chatMsg)
         return;
     }
 
-    Being *being = beingManager->findBeing(id);
+    Being *being = actorSpriteManager->findBeing(id);
 
-    std::string mes;
-    if (being)
+    if (!being)
     {
-        mes = being->getName() + " : " + chatMsg;
-        being->setSpeech(chatMsg, SPEECH_TIME);
+        logger->log("Warning: Received GPMSG_SAY for unknown being with id %i."
+                    " (Message is: %s)", id, chatMsg.c_str());
+        return;
     }
-    else
-        mes = "Unknown : " + chatMsg;
 
-    localChatTab->chatLog(mes, being == player_node ? BY_PLAYER : BY_OTHER);
+    std::string mes = being->getName() + " : " + chatMsg;
+
+    Mana::Event event(being == player_node ? EVENT_PLAYER : EVENT_BEING);
+    event.setString("message", mes);
+    event.setString("text", chatMsg);
+    event.setString("nick", being->getName());
+    event.setInt("beingId", id);
+    event.setInt("permissions", player_relations
+                 .checkPermissionSilently(being->getName(),
+                 PlayerRelation::SPEECH_LOG | PlayerRelation::SPEECH_FLOAT));
+    event.trigger(CHANNEL_CHAT);
 }
 
 void ChatHandler::handleEnterChannelResponse(Net::MessageIn &msg)
@@ -198,13 +207,13 @@ void ChatHandler::handleEnterChannelResponse(Net::MessageIn &msg)
     }
     else
     {
-        localChatTab->chatLog(_("Error joining channel."), BY_SERVER);
+        SERVER_NOTICE(_("Error joining channel."))
     }
 }
 
 void ChatHandler::handleListChannelsResponse(Net::MessageIn &msg)
 {
-    localChatTab->chatLog(_("Listing channels."), BY_SERVER);
+    SERVER_NOTICE(_("Listing channels."))
     while (msg.getUnreadLength())
     {
         std::string channelName = msg.readString();
@@ -214,9 +223,9 @@ void ChatHandler::handleListChannelsResponse(Net::MessageIn &msg)
         numUsers << msg.readInt16();
         channelName += " - ";
         channelName += numUsers.str();
-        localChatTab->chatLog(channelName, BY_SERVER);
+        SERVER_NOTICE(channelName)
     }
-    localChatTab->chatLog(_("End of channel list."), BY_SERVER);
+    SERVER_NOTICE(_("End of channel list."))
 }
 
 void ChatHandler::handlePrivateMessage(Net::MessageIn &msg)
@@ -224,13 +233,18 @@ void ChatHandler::handlePrivateMessage(Net::MessageIn &msg)
     std::string userNick = msg.readString();
     std::string chatMsg = msg.readString();
 
-    chatWindow->whisper(userNick, chatMsg);
+    Mana::Event event(EVENT_WHISPER);
+    event.setString("nick", userNick);
+    event.setString("message", chatMsg);
+    event.trigger(CHANNEL_CHAT);
 }
 
 void ChatHandler::handleAnnouncement(Net::MessageIn &msg)
 {
     std::string chatMsg = msg.readString();
-    localChatTab->chatLog(chatMsg, BY_GM);
+    Mana::Event event(EVENT_ANNOUNCEMENT);
+    event.setString("message", chatMsg);
+    event.trigger(CHANNEL_CHAT);
 }
 
 void ChatHandler::handleChatMessage(Net::MessageIn &msg)
@@ -341,7 +355,7 @@ void ChatHandler::handleWhoResponse(Net::MessageIn &msg)
         {
             break;
         }
-        localChatTab->chatLog(userNick, BY_SERVER);
+        SERVER_NOTICE(userNick)
     }
 }
 
diff --git a/src/net/manaserv/connection.cpp b/src/net/manaserv/connection.cpp
index fbd2ed22..b404191f 100644
--- a/src/net/manaserv/connection.cpp
+++ b/src/net/manaserv/connection.cpp
@@ -60,7 +60,7 @@ bool Connection::connect(const std::string &address, short port)
     enetAddress.port = port;
 
     // Initiate the connection, allocating channel 0.
-#ifdef ENET_VERSION_MAJOR
+#if defined(ENET_VERSION) && ENET_VERSION >= ENET_CUTOFF
     mConnection = enet_host_connect(mClient, &enetAddress, 1, 0);
 #else
     mConnection = enet_host_connect(mClient, &enetAddress, 1);
diff --git a/src/net/manaserv/connection.h b/src/net/manaserv/connection.h
index b39f8957..808a6d40 100644
--- a/src/net/manaserv/connection.h
+++ b/src/net/manaserv/connection.h
@@ -26,6 +26,12 @@
 
 #include <iosfwd>
 
+#ifdef ENET_VERSION_CREATE
+#define ENET_CUTOFF ENET_VERSION_CREATE(1,3,0)
+#else
+#define ENET_CUTOFF 0xFFFFFFFF
+#endif
+
 namespace ManaServ
 {
     class MessageOut;
diff --git a/src/net/manaserv/defines.h b/src/net/manaserv/defines.h
new file mode 100644
index 00000000..e97866df
--- /dev/null
+++ b/src/net/manaserv/defines.h
@@ -0,0 +1,76 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MANASERV_DEFINES_H
+#define MANASERV_DEFINES_H
+
+/**
+ * Attributes used during combat. Available to all the beings.
+ */
+enum
+{
+BASE_ATTR_BEGIN = 0,
+    BASE_ATTR_PHY_ATK_MIN = BASE_ATTR_BEGIN,
+    BASE_ATTR_PHY_ATK_DELTA,
+                       /**< Physical attack power. */
+    BASE_ATTR_MAG_ATK, /**< Magical attack power. */
+    BASE_ATTR_PHY_RES, /**< Resistance to physical damage. */
+    BASE_ATTR_MAG_RES, /**< Resistance to magical damage. */
+    BASE_ATTR_EVADE,   /**< Ability to avoid hits. */
+    BASE_ATTR_HIT,     /**< Ability to hit stuff. */
+    BASE_ATTR_HP,      /**< Hit Points (Base value: maximum, Modded value: current) */
+    BASE_ATTR_HP_REGEN,/**< number of HP regenerated every 10 game ticks */
+    BASE_ATTR_END,
+    BASE_ATTR_NB = BASE_ATTR_END - BASE_ATTR_BEGIN,
+
+    BASE_ELEM_BEGIN = BASE_ATTR_END,
+    BASE_ELEM_NEUTRAL = BASE_ELEM_BEGIN,
+    BASE_ELEM_FIRE,
+    BASE_ELEM_WATER,
+    BASE_ELEM_EARTH,
+    BASE_ELEM_AIR,
+    BASE_ELEM_SACRED,
+    BASE_ELEM_DEATH,
+    BASE_ELEM_END,
+    BASE_ELEM_NB = BASE_ELEM_END - BASE_ELEM_BEGIN,
+
+    NB_BEING_ATTRIBUTES = BASE_ELEM_END
+};
+
+/**
+ * Attributes of characters. Used to derive being attributes.
+ */
+enum
+{
+    CHAR_ATTR_BEGIN = NB_BEING_ATTRIBUTES,
+    CHAR_ATTR_STRENGTH = CHAR_ATTR_BEGIN,
+    CHAR_ATTR_AGILITY,
+    CHAR_ATTR_DEXTERITY,
+    CHAR_ATTR_VITALITY,
+    CHAR_ATTR_INTELLIGENCE,
+    CHAR_ATTR_WILLPOWER,
+    CHAR_ATTR_END,
+    CHAR_ATTR_NB = CHAR_ATTR_END - CHAR_ATTR_BEGIN,
+
+    NB_CHARACTER_ATTRIBUTES = CHAR_ATTR_END
+};
+
+#endif // MANASERV_DEFINES_H
diff --git a/src/net/manaserv/effecthandler.cpp b/src/net/manaserv/effecthandler.cpp
index 27db9b59..7051bedd 100644
--- a/src/net/manaserv/effecthandler.cpp
+++ b/src/net/manaserv/effecthandler.cpp
@@ -21,13 +21,15 @@
 
 #include "net/manaserv/effecthandler.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
 #include "effectmanager.h"
 #include "log.h"
 
+#include "gui/viewport.h"
+
 #include "net/messagein.h"
 
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 namespace ManaServ {
 
@@ -36,6 +38,7 @@ EffectHandler::EffectHandler()
     static const Uint16 _messages[] = {
         GPMSG_CREATE_EFFECT_POS,
         GPMSG_CREATE_EFFECT_BEING,
+        GPMSG_SHAKE,
         0
     };
     handledMessages = _messages;
@@ -51,6 +54,9 @@ void EffectHandler::handleMessage(Net::MessageIn &msg)
         case GPMSG_CREATE_EFFECT_BEING:
             handleCreateEffectBeing(msg);
             break;
+        case GPMSG_SHAKE:
+            handleShake(msg);
+            break;
         default:
             break;
     }
@@ -68,11 +74,43 @@ void EffectHandler::handleCreateEffectBeing(Net::MessageIn &msg)
 {
     int eid = msg.readInt16();
     int bid = msg.readInt16();
-    Being* b = beingManager->findBeing(bid);
+    Being* b = actorSpriteManager->findBeing(bid);
     if (b)
         effectManager->trigger(eid, b);
     else
         logger->log("Warning: CreateEffect called for unknown being #%d", bid);
 }
 
+void EffectHandler::handleShake(Net::MessageIn &msg)
+{
+    int16_t intensityX = 0;
+    int16_t intensityY = 0;
+    float decay;
+    int duration;
+
+    switch (msg.getUnreadLength())
+    {
+        case 4:
+            intensityX =  msg.readInt16();
+            intensityY =  msg.readInt16();
+            viewport->shakeScreen(intensityX, intensityY);
+            break;
+        case 6:
+            intensityX =  msg.readInt16();
+            intensityY =  msg.readInt16();
+            decay =  msg.readInt16() / 10000.0f;
+            viewport->shakeScreen(intensityX, intensityY, decay);
+            break;
+        case 8:
+            intensityX =  msg.readInt16();
+            intensityY =  msg.readInt16();
+            decay =  msg.readInt16() / 10000.0f;
+            duration =  msg.readInt16();
+            viewport->shakeScreen(intensityX, intensityY, decay, duration);
+            break;
+        default:
+            logger->log("Warning: Received GPMSG_SHAKE message with unexpected length of %d bytes", msg.getUnreadLength());
+    }
+}
+
 } // namespace ManaServ
diff --git a/src/net/manaserv/effecthandler.h b/src/net/manaserv/effecthandler.h
index a0445aad..d31c3421 100644
--- a/src/net/manaserv/effecthandler.h
+++ b/src/net/manaserv/effecthandler.h
@@ -36,6 +36,7 @@ class EffectHandler : public MessageHandler
     private:
         void handleCreateEffectPos(Net::MessageIn &msg);
         void handleCreateEffectBeing(Net::MessageIn &msg);
+        void handleShake(Net::MessageIn &msg);
 };
 
 } // namespace ManaServ
diff --git a/src/net/manaserv/gamehandler.cpp b/src/net/manaserv/gamehandler.cpp
index 5e29a896..040a5e6c 100644
--- a/src/net/manaserv/gamehandler.cpp
+++ b/src/net/manaserv/gamehandler.cpp
@@ -27,7 +27,7 @@
 #include "net/manaserv/chathandler.h"
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 extern Net::GameHandler *gameHandler;
 
@@ -115,16 +115,6 @@ void GameHandler::disconnect()
         chatHandler->disconnect();
 }
 
-void GameHandler::inGame()
-{
-    // TODO
-}
-
-void GameHandler::mapLoaded(const std::string &mapName)
-{
-    // TODO
-}
-
 void GameHandler::who()
 {
     // TODO
diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h
index dde1748f..2e9f37fe 100644
--- a/src/net/manaserv/gamehandler.h
+++ b/src/net/manaserv/gamehandler.h
@@ -42,10 +42,6 @@ class GameHandler : public MessageHandler, public Net::GameHandler
 
         void disconnect();
 
-        void inGame();
-
-        void mapLoaded(const std::string &mapName);
-
         void who();
 
         void quit(bool reconnectAccount);
@@ -53,12 +49,15 @@ class GameHandler : public MessageHandler, public Net::GameHandler
         void quit() { quit(false); }
 
         void ping(int tick);
-        
+
         bool removeDeadBeings() const { return false; }
 
         void clear();
 
         void gameLoading();
+
+        /** The ManaServ protocol doesn't use the MP status bar. */
+        bool canUseMagicBar() const { return false; }
 };
 
 } // namespace ManaServ
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 0d3073f1..d2151307 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -46,7 +46,7 @@
 #include "net/manaserv/partyhandler.h"
 #include "net/manaserv/playerhandler.h"
 #include "net/manaserv/specialhandler.h"
-#include "net/manaserv/stats.h"
+#include "net/manaserv/attributes.h"
 #include "net/manaserv/tradehandler.h"
 
 #include "utils/gettext.h"
@@ -90,6 +90,9 @@ GeneralHandler::GeneralHandler():
     chatServerConnection = getConnection();
 
     generalHandler = this;
+
+    listen(CHANNEL_CLIENT);
+    listen(CHANNEL_GAME);
 }
 
 void GeneralHandler::load()
@@ -127,9 +130,9 @@ void GeneralHandler::reload()
     gameServer.clear();
     chatServer.clear();
 
-    Stats::unload();
-    Stats::load();
-    Stats::informItemDB();
+    Attributes::unload();
+    Attributes::load();
+    Attributes::informItemDB();
 }
 
 void GeneralHandler::unload()
@@ -147,7 +150,7 @@ void GeneralHandler::unload()
     delete gameServerConnection;
     delete chatServerConnection;
 
-    Stats::unload();
+    Attributes::unload();
     finalize();
 }
 
@@ -163,38 +166,43 @@ void GeneralHandler::flushNetwork()
     }
 }
 
-void GeneralHandler::guiWindowsLoaded()
-{
-    inventoryWindow->setSplitAllowed(true);
-    skillDialog->loadSkills("mana-skills.xml");
-    specialsWindow->loadSpecials("specials.xml");
-
-    player_node->setExpNeeded(100);
-
-    Stats::informStatusWindow();
-}
-
-void GeneralHandler::guiWindowsUnloaded()
-{
-    // TODO
-}
-
 void GeneralHandler::clearHandlers()
 {
     clearNetworkHandlers();
 }
 
-void GeneralHandler::stateChanged(State oldState, State newState)
+void GeneralHandler::event(Channels channel,
+                           const Mana::Event &event)
 {
-    if (newState == STATE_GAME)
+    if (channel == CHANNEL_CLIENT)
     {
-        GameHandler *game = static_cast<GameHandler*>(Net::getGameHandler());
-        game->gameLoading();
+        if (event.getName() == EVENT_STATECHANGE)
+        {
+            int newState = event.getInt("newState");
+
+            if (newState == STATE_GAME)
+            {
+                GameHandler *game = static_cast<GameHandler*>(Net::getGameHandler());
+                game->gameLoading();
+            }
+        }
+        else if (event.getName() == EVENT_DBSLOADING)
+        {
+            Attributes::load();
+            Attributes::informItemDB();
+        }
     }
-    else if (newState == STATE_LOAD_DATA)
+    else if (channel == CHANNEL_GAME)
     {
-        Stats::load();
-        Stats::informItemDB();
+        if (event.getName() == EVENT_GUIWINDOWSLOADED)
+        {
+            inventoryWindow->setSplitAllowed(true);
+            skillDialog->loadSkills("mana-skills.xml");
+
+            PlayerInfo::setAttribute(EXP_NEEDED, 100);
+
+            Attributes::informStatusWindow();
+        }
     }
 }
 
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index 58b95529..c8671ec1 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -22,6 +22,8 @@
 #ifndef NET_MANASERV_GENERALHANDLER_H
 #define NET_MANASERV_GENERALHANDLER_H
 
+#include "listener.h"
+
 #include "net/generalhandler.h"
 #include "net/net.h"
 
@@ -29,7 +31,7 @@
 
 namespace ManaServ {
 
-class GeneralHandler : public Net::GeneralHandler
+class GeneralHandler : public Net::GeneralHandler, public Mana::Listener
 {
     public:
         GeneralHandler();
@@ -42,13 +44,9 @@ class GeneralHandler : public Net::GeneralHandler
 
         void flushNetwork();
 
-        void guiWindowsLoaded();
-
-        void guiWindowsUnloaded();
-
         void clearHandlers();
 
-        void stateChanged(State oldState, State newState);
+        void event(Channels channel, const Mana::Event &event);
 
     protected:
         MessageHandlerPtr mBeingHandler;
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index 253efb01..a2c571bc 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -21,23 +21,24 @@
 
 #include "net/manaserv/guildhandler.h"
 
+#include "event.h"
 #include "guild.h"
 #include "log.h"
 #include "localplayer.h"
 #include "channel.h"
 #include "channelmanager.h"
 
-#include "gui/widgets/channeltab.h"
-#include "gui/chat.h"
 #include "gui/socialwindow.h"
 
+#include "gui/widgets/channeltab.h"
+
 #include "net/messagein.h"
 #include "net/net.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -78,12 +79,12 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 // TODO - Acknowledge guild was created
-                localChatTab->chatLog(_("Guild created."));
+                SERVER_NOTICE(_("Guild created."))
                 joinedGuild(msg);
             }
             else
             {
-                localChatTab->chatLog(_("Error creating guild."));
+                SERVER_NOTICE(_("Error creating guild."))
             }
         } break;
 
@@ -93,7 +94,7 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 // TODO - Acknowledge invite was sent
-                localChatTab->chatLog(_("Invite sent."));
+                SERVER_NOTICE(_("Invite sent."))
             }
         } break;
 
@@ -200,12 +201,12 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 // promotion succeeded
-                localChatTab->chatLog(_("Member was promoted successfully."));
+                SERVER_NOTICE(_("Member was promoted successfully."))
             }
             else
             {
                 // promotion failed
-                localChatTab->chatLog(_("Failed to promote member."));
+                SERVER_NOTICE(_("Failed to promote member."))
             }
         }
 
@@ -275,9 +276,9 @@ void GuildHandler::invite(int guildId, const std::string &name)
     chatServerConnection->send(msg);
 }
 
-void GuildHandler::invite(int guildId, Player *player)
+void GuildHandler::invite(int guildId, Being *being)
 {
-    invite(guildId, player->getName());
+    invite(guildId, being->getName());
 }
 
 void GuildHandler::inviteResponse(int guildId, bool response)
diff --git a/src/net/manaserv/guildhandler.h b/src/net/manaserv/guildhandler.h
index 9929d135..bde677fb 100644
--- a/src/net/manaserv/guildhandler.h
+++ b/src/net/manaserv/guildhandler.h
@@ -41,7 +41,7 @@ public:
 
     void invite(int guildId, const std::string &name);
 
-    void invite(int guidId, Player *player);
+    void invite(int guidId, Being *being);
 
     void inviteResponse(int guidId, bool response);
 
diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index 76fca7ae..5edf3597 100644
--- a/src/net/manaserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -26,18 +26,15 @@
 #include "item.h"
 #include "itemshortcut.h"
 #include "localplayer.h"
-
-#include "gui/chat.h"
+#include "playerinfo.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 #include "resources/iteminfo.h"
 
-#include "log.h" // <<< REMOVE ME!
-
 extern Net::InventoryHandler *inventoryHandler;
 
 namespace ManaServ {
@@ -49,10 +46,13 @@ InventoryHandler::InventoryHandler()
     static const Uint16 _messages[] = {
         GPMSG_INVENTORY_FULL,
         GPMSG_INVENTORY,
+        GPMSG_EQUIP,
         0
     };
     handledMessages = _messages;
     inventoryHandler = this;
+
+    listen(CHANNEL_ITEM);
 }
 
 void InventoryHandler::handleMessage(Net::MessageIn &msg)
@@ -60,114 +60,142 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case GPMSG_INVENTORY_FULL:
-            player_node->clearInventory();
-            player_node->mEquipment->setBackend(&mEquips);
-            // no break!
-
-        case GPMSG_INVENTORY:
-            while (msg.getUnreadLength())
             {
-                unsigned int slot = msg.readInt8();
-                if (slot == 255)
+                PlayerInfo::clearInventory();
+                PlayerInfo::getEquipment()->setBackend(&mEquips);
+                int count = msg.readInt16();
+                while (count--)
                 {
-                    player_node->setMoney(msg.readInt32());
-                    continue;
+                    unsigned int slot = msg.readInt16();
+                    int id = msg.readInt16();
+                    unsigned int amount = msg.readInt16();
+                    PlayerInfo::setInventoryItem(slot, id, amount);
                 }
-
-                int id = msg.readInt16();
-                if (slot < EQUIPMENT_SIZE)
-                {
-                    mEquips.setEquipment(slot, id);
-                }
-                else if (slot >= 32 && slot < 32 + getSize(Inventory::INVENTORY))
+                while (msg.getUnreadLength())
                 {
-                    int amount = id ? msg.readInt8() : 0;
-                    player_node->setInvItem(slot - 32, id, amount);
+                    unsigned int slot = msg.readInt8();
+                    unsigned int ref = msg.readInt16();
+
+                    mEquips.addEquipment(slot, ref);
                 }
-            };
+            }
             break;
-    }
-}
 
-void InventoryHandler::equipItem(const Item *item)
-{
-    MessageOut msg(PGMSG_EQUIP);
-    msg.writeInt8(item->getInvIndex());
-    gameServerConnection->send(msg);
-}
-
-void InventoryHandler::unequipItem(const Item *item)
-{
-    MessageOut msg(PGMSG_UNEQUIP);
-    msg.writeInt8(item->getInvIndex());
-    gameServerConnection->send(msg);
-
-    // Tidy equipment directly to avoid weapon still shown bug, for instance
-    int equipSlot = item->getInvIndex();
-    logger->log("Unequipping %d", equipSlot);
-    mEquips.setEquipment(equipSlot, 0);
-}
-
-void InventoryHandler::useItem(const Item *item)
-{
-    MessageOut msg(PGMSG_USE_ITEM);
-    msg.writeInt8(item->getInvIndex());
-    gameServerConnection->send(msg);
-}
-
-void InventoryHandler::dropItem(const Item *item, int amount)
-{
-    MessageOut msg(PGMSG_DROP);
-    msg.writeInt8(item->getInvIndex());
-    msg.writeInt8(amount);
-    gameServerConnection->send(msg);
-}
+        case GPMSG_INVENTORY:
+            while (msg.getUnreadLength())
+            {
+                unsigned int slot = msg.readInt16();
+                int id = msg.readInt16();
+                unsigned int amount = id ? msg.readInt16() : 0;
+                PlayerInfo::setInventoryItem(slot, id, amount);
+            }
+            break;
 
-bool InventoryHandler::canSplit(const Item *item)
-{
-    return item && !item->isEquipment() && item->getQuantity() > 1;
-}
+        case GPMSG_EQUIP:
+            while (msg.getUnreadLength())
+            {
+                unsigned int ref = msg.readInt16();
+                int count = msg.readInt8();
+                while (count--)
+                {
+                    unsigned int slot = msg.readInt8();
+                    unsigned int used = msg.readInt8();
 
-void InventoryHandler::splitItem(const Item *item, int amount)
-{
-    int newIndex = player_node->getInventory()->getFreeSlot();
-    if (newIndex > Inventory::NO_SLOT_INDEX)
-    {
-        MessageOut msg(PGMSG_MOVE_ITEM);
-        msg.writeInt8(item->getInvIndex());
-        msg.writeInt8(newIndex);
-        msg.writeInt8(amount);
-        gameServerConnection->send(msg);
+                    mEquips.setEquipment(slot, used, ref);
+                }
+            }
+            break;
     }
 }
 
-void InventoryHandler::moveItem(int oldIndex, int newIndex)
-{
-    if (oldIndex == newIndex)
-        return;
-
-    MessageOut msg(PGMSG_MOVE_ITEM);
-    msg.writeInt8(oldIndex);
-    msg.writeInt8(newIndex);
-    msg.writeInt8(player_node->getInventory()->getItem(oldIndex)
-                  ->getQuantity());
-    gameServerConnection->send(msg);
-}
-
-void InventoryHandler::openStorage(int type)
+void InventoryHandler::event(Channels channel,
+                             const Mana::Event &event)
 {
-    // TODO
-}
+    if (channel == CHANNEL_ITEM)
+    {
+        Item *item = event.getItem("item");
+
+        if (!item)
+            return;
+
+        int index = item->getInvIndex();
+
+        if (event.getName() == EVENT_DOEQUIP)
+        {
+            MessageOut msg(PGMSG_EQUIP);
+            msg.writeInt8(index);
+            gameServerConnection->send(msg);
+        }
+        else if (event.getName() == EVENT_DOUNEQUIP)
+        {
+            MessageOut msg(PGMSG_UNEQUIP);
+            msg.writeInt8(index);
+            gameServerConnection->send(msg);
+
+            // Tidy equipment directly to avoid weapon still shown bug,
+            // for instance.
+            mEquips.setEquipment(index, 0, 0);
+        }
+        else if (event.getName() == EVENT_DOUSE)
+        {
+            MessageOut msg(PGMSG_USE_ITEM);
+            msg.writeInt8(index);
+            gameServerConnection->send(msg);
+        }
+        else if (event.getName() == EVENT_DODROP)
+        {
+            int amount = event.getInt("amount", 1);
+
+            MessageOut msg(PGMSG_DROP);
+            msg.writeInt8(index);
+            msg.writeInt8(amount);
+            gameServerConnection->send(msg);
+        }
+        else if (event.getName() == EVENT_DOSPLIT)
+        {
+            int amount = event.getInt("amount", 1);
+
+            int newIndex = PlayerInfo::getInventory()->getFreeSlot();
+            if (newIndex > Inventory::NO_SLOT_INDEX)
+            {
+                MessageOut msg(PGMSG_MOVE_ITEM);
+                msg.writeInt8(index);
+                msg.writeInt8(newIndex);
+                msg.writeInt8(amount);
+                gameServerConnection->send(msg);
+            }
+        }
+        else if (event.getName() == EVENT_DOMOVE)
+        {
+            int newIndex = event.getInt("newIndex", -1);
+
+            if (newIndex >= 0)
+            {
+                if (index == newIndex)
+                    return;
+
+                MessageOut msg(PGMSG_MOVE_ITEM);
+                msg.writeInt8(index);
+                msg.writeInt8(newIndex);
+                msg.writeInt8(item->getQuantity());
+                gameServerConnection->send(msg);
+            }
+            else
+            {
+                /*int source = event.getInt("source");
+                int destination = event.getInt("destination");
+                int amount = event.getInt("amount", 1);*/
 
-void InventoryHandler::closeStorage(int type)
-{
-    // TODO
+                // TODO
+            }
+        }
+    }
 }
 
-void InventoryHandler::moveItem(int source, int slot, int amount,
-                                int destination)
+bool InventoryHandler::canSplit(const Item *item)
 {
-    // TODO
+    return item && !item->getInfo().getEquippable()
+           && item->getQuantity() > 1;
 }
 
 size_t InventoryHandler::getSize(int type) const
diff --git a/src/net/manaserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h
index fd08b95e..bb68ceeb 100644
--- a/src/net/manaserv/inventoryhandler.h
+++ b/src/net/manaserv/inventoryhandler.h
@@ -23,6 +23,7 @@
 #define NET_MANASERV_INVENTORYHANDLER_H
 
 #include "equipment.h"
+#include "listener.h"
 
 #include "net/inventoryhandler.h"
 
@@ -37,64 +38,38 @@ class EquipBackend : public Equipment::Backend
         { memset(mEquipment, 0, sizeof(mEquipment)); }
 
         Item *getEquipment(int index) const
-        { return mEquipment[index]; }
+        { return 0; }
 
         void clear()
         {
-            for (int i = 0; i < EQUIPMENT_SIZE; ++i)
-                delete mEquipment[i];
+        }
 
-            std::fill_n(mEquipment, EQUIPMENT_SIZE, (Item*) 0);
+        void setEquipment(unsigned int slot, unsigned int used, int reference)
+        {
+            printf("Equip: %d at %dx%d\n", reference, slot, used);
         }
 
-        void setEquipment(int index, int id, int quantity = 0)
+        void addEquipment(unsigned int slot, int reference)
         {
-            if (mEquipment[index] && mEquipment[index]->getId() == id)
-                return;
-
-            delete mEquipment[index];
-            mEquipment[index] = (id > 0) ? new Item(id, quantity) : 0;
-
-            if (mEquipment[index])
-            {
-                mEquipment[index]->setInvIndex(index);
-                mEquipment[index]->setEquipped(true);
-                mEquipment[index]->setInEquipment(true);
-            }
+            printf("Equip: %d at %d\n", reference, slot);
         }
 
     private:
         Item *mEquipment[EQUIPMENT_SIZE];
 };
 
-class InventoryHandler : public MessageHandler, Net::InventoryHandler
+class InventoryHandler : public MessageHandler, Net::InventoryHandler,
+        public Mana::Listener
 {
     public:
         InventoryHandler();
 
         void handleMessage(Net::MessageIn &msg);
 
-        void equipItem(const Item *item);
-
-        void unequipItem(const Item *item);
-
-        void useItem(const Item *item);
-
-        void dropItem(const Item *item, int amount);
+        void event(Channels channel, const Mana::Event &event);
 
         bool canSplit(const Item *item);
 
-        void splitItem(const Item *item, int amount);
-
-        void moveItem(int oldIndex, int newIndex);
-
-        void openStorage(int type);
-
-        void closeStorage(int type);
-
-        void moveItem(int source, int slot, int amount,
-                      int destination);
-
         size_t getSize(int type) const;
 
     private:
diff --git a/src/net/manaserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp
index dc3b9f14..af3457db 100644
--- a/src/net/manaserv/itemhandler.cpp
+++ b/src/net/manaserv/itemhandler.cpp
@@ -21,9 +21,9 @@
 
 #include "net/manaserv/itemhandler.h"
 
-#include "flooritemmanager.h"
+#include "actorspritemanager.h"
 
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 #include "net/manaserv/messagein.h"
 
 #include "game.h"
@@ -62,8 +62,7 @@ void ItemHandler::handleMessage(Net::MessageIn &msg)
                     {
                         if (Map *map = game->getCurrentMap())
                         {
-                            floorItemManager->create(id,
-                                                     itemId,
+                            actorSpriteManager->createItem(id, itemId,
                                                      x / map->getTileWidth(),
                                                      y / map->getTileHeight());
                         }
@@ -75,9 +74,9 @@ void ItemHandler::handleMessage(Net::MessageIn &msg)
                         }
                     }
                 }
-                else if (FloorItem *item = floorItemManager->findById(id))
+                else if (FloorItem *item = actorSpriteManager->findItem(id))
                 {
-                    floorItemManager->destroy(item);
+                    actorSpriteManager->destroy(item);
                 }
             }
         } break;
diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp
index 61671824..2f802e21 100644
--- a/src/net/manaserv/loginhandler.cpp
+++ b/src/net/manaserv/loginhandler.cpp
@@ -29,7 +29,7 @@
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 #include "utils/gettext.h"
 #include "utils/sha256.h"
@@ -196,7 +196,7 @@ void LoginHandler::handleMessage(Net::MessageIn &msg)
             // Successful unregistration
             if (errMsg == ERRMSG_OK)
             {
-                Client::setState(STATE_UNREGISTER);
+                Client::setState(STATE_UNREGISTER_SUCCESS);
             }
             // Unregistration failed
             else
@@ -251,7 +251,7 @@ void LoginHandler::handleLoginResponse(Net::MessageIn &msg)
 
     if (errMsg == ERRMSG_OK)
     {
-        readUpdateHost(msg);
+        readServerInfo(msg);
         // No worlds atm, but future use :-D
         Client::setState(STATE_WORLD_SELECT);
     }
@@ -289,7 +289,7 @@ void LoginHandler::handleRegisterResponse(Net::MessageIn &msg)
 
     if (errMsg == ERRMSG_OK)
     {
-        readUpdateHost(msg);
+        readServerInfo(msg);
         Client::setState(STATE_WORLD_SELECT);
     }
     else
@@ -320,7 +320,7 @@ void LoginHandler::handleRegisterResponse(Net::MessageIn &msg)
     }
 }
 
-void LoginHandler::readUpdateHost(Net::MessageIn &msg)
+void LoginHandler::readServerInfo(Net::MessageIn &msg)
 {
     // Safety check for outdated manaserv versions (remove me later)
     if (msg.getUnreadLength() == 0)
@@ -332,6 +332,13 @@ void LoginHandler::readUpdateHost(Net::MessageIn &msg)
         mLoginData->updateHost = updateHost;
     else
         logger->log("Warning: server does not have an update host set!");
+
+    // Read the client data folder for dynamic data loading.
+    // This is only used by the QT client.
+    msg.readString();
+
+    // Read the number of character slots
+    mLoginData->characterSlots = msg.readInt8();
 }
 
 void LoginHandler::connect()
@@ -381,7 +388,7 @@ void LoginHandler::loginAccount(LoginData *loginData)
 
     MessageOut msg(PAMSG_LOGIN);
 
-    msg.writeInt32(0); // client version
+    msg.writeInt32(PROTOCOL_VERSION); // client version
     msg.writeString(loginData->username);
     msg.writeString(sha256(loginData->username + loginData->password));
 
@@ -429,7 +436,7 @@ void LoginHandler::registerAccount(LoginData *loginData)
 
     MessageOut msg(PAMSG_REGISTER);
 
-    msg.writeInt32(0); // client version
+    msg.writeInt32(PROTOCOL_VERSION); // client version
     msg.writeString(loginData->username);
     // Use a hashed password for privacy reasons
     msg.writeString(sha256(loginData->username + loginData->password));
diff --git a/src/net/manaserv/loginhandler.h b/src/net/manaserv/loginhandler.h
index d2ffbc3d..2062dcb5 100644
--- a/src/net/manaserv/loginhandler.h
+++ b/src/net/manaserv/loginhandler.h
@@ -80,7 +80,7 @@ class LoginHandler : public MessageHandler, public Net::LoginHandler
         void handleLoginResponse(Net::MessageIn &msg);
         void handleRegisterResponse(Net::MessageIn &msg);
 
-        void readUpdateHost(Net::MessageIn &msg);
+        void readServerInfo(Net::MessageIn &msg);
 
         LoginData *mLoginData;
         unsigned int mMinUserNameLength;
diff --git a/src/net/manaserv/protocol.h b/src/net/manaserv/manaserv_protocol.h
index 226a27a0..16e56183 100644
--- a/src/net/manaserv/protocol.h
+++ b/src/net/manaserv/manaserv_protocol.h
@@ -22,6 +22,10 @@
 #ifndef MANASERV_PROTOCOL_H
 #define MANASERV_PROTOCOL_H
 
+namespace ManaServ {
+
+enum { PROTOCOL_VERSION = 1 };
+
 /**
  * Enumerated type for communicated messages:
  *
@@ -44,21 +48,24 @@
 enum {
     // Login/Register
     PAMSG_REGISTER                 = 0x0000, // D version, S username, S password, S email, S captcha response
-    APMSG_REGISTER_RESPONSE        = 0x0002, // B error, [S updatehost]
+    APMSG_REGISTER_RESPONSE        = 0x0002, // B error, S updatehost, S Client data URL, B Character slots
     PAMSG_UNREGISTER               = 0x0003, // S username, S password
     APMSG_UNREGISTER_RESPONSE      = 0x0004, // B error
     PAMSG_REQUEST_REGISTER_INFO    = 0x0005, //
     APMSG_REGISTER_INFO_RESPONSE   = 0x0006, // B byte registration Allowed, byte minNameLength, byte maxNameLength, string captchaURL, string captchaInstructions
     PAMSG_LOGIN                    = 0x0010, // D version, S username, S password
-    APMSG_LOGIN_RESPONSE           = 0x0012, // B error, [S updatehost]
+    APMSG_LOGIN_RESPONSE           = 0x0012, // B error, S updatehost, S Client data URL, B Character slots
     PAMSG_LOGOUT                   = 0x0013, // -
     APMSG_LOGOUT_RESPONSE          = 0x0014, // B error
-    PAMSG_CHAR_CREATE              = 0x0020, // S name, B hair style, B hair color, B gender, W*6 stats
+    PAMSG_CHAR_CREATE              = 0x0020, // S name, B hair style, B hair color, B gender, B slot, {W stats}*
     APMSG_CHAR_CREATE_RESPONSE     = 0x0021, // B error
-    PAMSG_CHAR_DELETE              = 0x0022, // B index
+    PAMSG_CHAR_DELETE              = 0x0022, // B slot
     APMSG_CHAR_DELETE_RESPONSE     = 0x0023, // B error
-    APMSG_CHAR_INFO                = 0x0024, // B index, S name, B gender, B hair style, B hair color, W level, W character points, W correction points, D money, W*6 stats
-    PAMSG_CHAR_SELECT              = 0x0026, // B index
+    // B slot, S name, B gender, B hair style, B hair color, W level,
+    // W character points, W correction points,
+    // {D attr id, D base value (in 1/256ths) D mod value (in 256ths) }*
+    APMSG_CHAR_INFO                = 0x0024, // ^
+    PAMSG_CHAR_SELECT              = 0x0026, // B slot
     APMSG_CHAR_SELECT_RESPONSE     = 0x0027, // B error, B*32 token, S game address, W game port, S chat address, W chat port
     PAMSG_EMAIL_CHANGE             = 0x0030, // S email
     APMSG_EMAIL_CHANGE_RESPONSE    = 0x0031, // B error
@@ -86,18 +93,19 @@ enum {
     PGMSG_EQUIP                    = 0x0112, // B slot
     PGMSG_UNEQUIP                  = 0x0113, // B slot
     PGMSG_MOVE_ITEM                = 0x0114, // B slot1, B slot2, B amount
-    GPMSG_INVENTORY                = 0x0120, // { B slot, W item id [, B amount] }*
-    GPMSG_INVENTORY_FULL           = 0x0121, // { B slot, W item id [, B amount] }*
-    GPMSG_PLAYER_ATTRIBUTE_CHANGE  = 0x0130, // { W attribute, W base value, W modified value }*
+    GPMSG_INVENTORY                = 0x0120, // { W slot, W item id [, W amount] (if item id is nonzero) }*
+    GPMSG_INVENTORY_FULL           = 0x0121, // W inventory slot count { W slot, W itemId, W amount }, { B equip slot, W invy slot}*
+    GPMSG_EQUIP                    = 0x0122, // { W Invy slot, B equip slot type count { B equip slot, B number used} }*
+    GPMSG_PLAYER_ATTRIBUTE_CHANGE  = 0x0130, // { W attribute, D base value (in 1/256ths), D modified value (in 1/256ths)}*
     GPMSG_PLAYER_EXP_CHANGE        = 0x0140, // { W skill, D exp got, D exp needed }*
     GPMSG_LEVELUP                  = 0x0150, // W new level, W character points, W correction points
     GPMSG_LEVEL_PROGRESS           = 0x0151, // B percent completed to next levelup
-    PGMSG_RAISE_ATTRIBUTE          = 0x0160, // B attribute
-    GPMSG_RAISE_ATTRIBUTE_RESPONSE = 0x0161, // B error, B attribute
-    PGMSG_LOWER_ATTRIBUTE          = 0x0170, // B attribute
-    GPMSG_LOWER_ATTRIBUTE_RESPONSE = 0x0171, // B error, B attribute
+    PGMSG_RAISE_ATTRIBUTE          = 0x0160, // W attribute
+    GPMSG_RAISE_ATTRIBUTE_RESPONSE = 0x0161, // B error, W attribute
+    PGMSG_LOWER_ATTRIBUTE          = 0x0170, // W attribute
+    GPMSG_LOWER_ATTRIBUTE_RESPONSE = 0x0171, // B error, W attribute
     PGMSG_RESPAWN                  = 0x0180, // -
-    GPMSG_BEING_ENTER              = 0x0200, // B type, W being id, B action, W*2 position
+    GPMSG_BEING_ENTER              = 0x0200, // B type, W being id, B action, W*2 position, B direction
                                              // character: S name, B hair style, B hair color, B gender, B item bitmask, { W item id }*
                                              // monster: W type id
                                              // npc: W type id
@@ -109,7 +117,7 @@ enum {
     GPMSG_BEING_ACTION_CHANGE      = 0x0271, // W being id, B action
     PGMSG_DIRECTION_CHANGE         = 0x0272, // B Direction
     GPMSG_BEING_DIR_CHANGE         = 0x0273, // W being id, B direction
-    GPMSG_BEING_HEALTH_CHANGE      = 0x0274, // W being id, W health
+    GPMSG_BEING_HEALTH_CHANGE      = 0x0274, // W being id, W hp, W max hp
     GPMSG_BEINGS_MOVE              = 0x0280, // { W being id, B flags [, W*2 position, B speed] }*
     GPMSG_ITEMS                    = 0x0281, // { W item id, W*2 position }*
     PGMSG_ATTACK                   = 0x0290, // W being id
@@ -155,6 +163,7 @@ enum {
     GPMSG_BEINGS_DAMAGE            = 0x0310, // { W being id, W amount }*
     GPMSG_CREATE_EFFECT_POS        = 0x0320, // W effect id, W*2 position
     GPMSG_CREATE_EFFECT_BEING      = 0x0321, // W effect id, W BeingID
+    GPMSG_SHAKE                    = 0x0330, // W intensityX, W intensityY, [W decay_times_10000, [W duration]]
 
     // Guild
     PCMSG_GUILD_CREATE                  = 0x0350, // S name
@@ -255,7 +264,8 @@ enum {
     ERRMSG_ALREADY_TAKEN,               // name used was already taken
     ERRMSG_SERVER_FULL,                 // the server is overloaded
     ERRMSG_TIME_OUT,                    // data failed to arrive in due time
-    ERRMSG_LIMIT_REACHED                // limit reached
+    ERRMSG_LIMIT_REACHED,               // limit reached
+    ERRMSG_ADMINISTRATIVE_LOGOFF        // kicked by server administrator
 };
 
 // used in AGMSG_REGISTER_RESPONSE to show state of item db
@@ -272,10 +282,11 @@ enum {
 
 // used to identify part of sync message
 enum {
-    SYNC_CHARACTER_POINTS = 0x01,       // D charId, D charPoints, D corrPoints, B attribute id, D attribute value
-    SYNC_CHARACTER_SKILL  = 0x02,       // D charId, B skillId, D skill value
-    SYNC_ONLINE_STATUS    = 0x03,       // D charId, B 0x00 = offline, 0x01 = online
-    SYNC_END_OF_BUFFER    = 0xFF        // shows, that the buffer ends here.
+    SYNC_CHARACTER_POINTS    = 0x01,       // D charId, D charPoints, D corrPoints
+    SYNC_CHARACTER_ATTRIBUTE = 0x02,       // D charId, D attrId, DF base, DF mod
+    SYNC_CHARACTER_SKILL     = 0x03,       // D charId, B skillId, D skill value
+    SYNC_ONLINE_STATUS       = 0x04,       // D charId, B 0x00 = offline, 0x01 = online
+    SYNC_END_OF_BUFFER       = 0xFF        // shows, that the buffer ends here.
 };
 
 // Login specific return values
@@ -300,9 +311,10 @@ enum {
     CREATE_INVALID_GENDER,
     CREATE_ATTRIBUTES_TOO_HIGH,
     CREATE_ATTRIBUTES_TOO_LOW,
-    CREATE_ATTRIBUTES_EQUAL_TO_ZERO,
+    CREATE_ATTRIBUTES_OUT_OF_RANGE,
     CREATE_EXISTS_NAME,
-    CREATE_TOO_MUCH_CHARACTERS
+    CREATE_TOO_MUCH_CHARACTERS,
+    CREATE_INVALID_SLOT
 };
 
 // Character attribute modification specific return value
@@ -370,8 +382,54 @@ enum {
     GUILD_EVENT_OFFLINE_PLAYER
 };
 
+/**
+  * Moves enum for beings and actors for others players vision.
+  * WARNING: Has to be in sync with the same enum in the Being class
+  * of the client!
+  */
+enum BeingAction
+{
+    STAND,
+    WALK,
+    ATTACK,
+    SIT,
+    DEAD,
+    HURT
+};
+
+/**
+  * Moves enum for beings and actors for others players attack types.
+  * WARNING: Has to be in sync with the same enum in the Being class
+  * of the client!
+  */
+enum AttackType
+{
+    HIT = 0x00,
+    CRITICAL = 0x0a,
+    MULTI = 0x08,
+    REFLECT = 0x04,
+    FLEE = 0x0b
+};
+
+/**
+ * Beings and actors directions
+ * WARNING: Has to be in sync with the same enum in the Being class
+ * of the client!
+ */
+enum BeingDirection
+{
+    DOWN = 1,
+    LEFT = 2,
+    UP = 4,
+    RIGHT = 8
+};
 
-enum
+/**
+  * enum for sprites layers.
+  * WARNING: Has to be in sync with the same enum in the Sprite class
+  * of the client!
+  */
+enum SpriteLayer
 {
     SPRITE_BASE = 0,
     SPRITE_SHOE,
@@ -383,4 +441,6 @@ enum
     SPRITE_VECTOREND
 };
 
+}; // Namespace ManaServ
+
 #endif // MANASERV_PROTOCOL_H
diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp
index 636585c9..a5bf6186 100644
--- a/src/net/manaserv/network.cpp
+++ b/src/net/manaserv/network.cpp
@@ -53,7 +53,7 @@ void initialize()
         logger->error("Failed to initialize ENet.");
     }
 
-#ifdef ENET_VERSION_MAJOR
+#if defined(ENET_VERSION) && ENET_VERSION >= ENET_CUTOFF
     client = enet_host_create(NULL, 3, 0, 0, 0);
 #else
     client = enet_host_create(NULL, 3, 0, 0);
diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp
index 392ec4fd..ca7d7415 100644
--- a/src/net/manaserv/npchandler.cpp
+++ b/src/net/manaserv/npchandler.cpp
@@ -21,16 +21,15 @@
 
 #include "net/manaserv/npchandler.h"
 
-#include "beingmanager.h"
-#include "npc.h"
-
-#include "gui/npcdialog.h"
-#include "gui/npcpostdialog.h"
+#include "actorspritemanager.h"
+#include "event.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
+
+#include "utils/stringutils.h"
 
 extern Net::NpcHandler *npcHandler;
 
@@ -56,76 +55,112 @@ NpcHandler::NpcHandler()
 
 void NpcHandler::handleMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
-    if (!being || being->getType() != Being::NPC)
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
+    if (!being || being->getType() != ActorSprite::NPC)
     {
         return;
     }
 
-    int npcId = being->getId();
-    NpcDialogs::iterator diag = mNpcDialogs.find(npcId);
-    NpcDialog *dialog;
-
-    if (diag == mNpcDialogs.end())
-    {
-        if (msg.getId() == GPMSG_NPC_ERROR || msg.getId() == GPMSG_NPC_CLOSE)
-            return; // Dialog is pointless in these cases
-
-        dialog = new NpcDialog(npcId);
-        Wrapper wrap;
-        wrap.dialog = dialog;
-        mNpcDialogs[npcId] = wrap;
-    }
-    else
-    {
-        dialog = diag->second.dialog;
-    }
+    int npcId = being->getId(), count = 0;
+    Mana::Event *event = 0;
 
     switch (msg.getId())
     {
-        case GPMSG_NPC_CHOICE:
-            dialog->choiceRequest();
-            while (msg.getUnreadLength())
-            {
-                dialog->addChoice(msg.readString());
-            }
-            break;
-
-        case GPMSG_NPC_NUMBER:
+    case GPMSG_NPC_CHOICE:
+        event = new Mana::Event(EVENT_MENU);
+        event->setInt("id", npcId);
+        while (msg.getUnreadLength())
         {
-            int min_num = msg.readInt32();
-            int max_num = msg.readInt32();
-            dialog->integerRequest(msg.readInt32(), min_num, max_num);
-            break;
+            count++;
+            event->setString("choice" + toString(count), msg.readString());
         }
+        event->setInt("choiceCount", count);
+        event->trigger(CHANNEL_NPC);
+        break;
+
+    case GPMSG_NPC_NUMBER:
+        event = new Mana::Event(EVENT_INTEGERINPUT);
+        event->setInt("id", npcId);
+        event->setInt("min", msg.readInt32());
+        event->setInt("max", msg.readInt32());
+        event->setInt("default", msg.readInt32());
+        event->trigger(CHANNEL_NPC);
+        break;
+
+    case GPMSG_NPC_STRING:
+        event = new Mana::Event(EVENT_STRINGINPUT);
+        event->setInt("id", npcId);
+        event->trigger(CHANNEL_NPC);
+        break;
+
+    case GPMSG_NPC_POST:
+        event = new Mana::Event(EVENT_POST);
+        event->setInt("id", npcId);
+        event->trigger(CHANNEL_NPC);
+        break;
+
+    case GPMSG_NPC_ERROR:
+        event = new Mana::Event(EVENT_END);
+        event->setInt("id", npcId);
+        event->trigger(CHANNEL_NPC);
+        break;
+
+    case GPMSG_NPC_MESSAGE:
+        event = new Mana::Event(EVENT_MESSAGE);
+        event->setInt("id", npcId);
+        event->setString("text", msg.readString(msg.getUnreadLength()));
+        event->trigger(CHANNEL_NPC);
+        delete event;
+
+        event = new Mana::Event(EVENT_NEXT);
+        event->setInt("id", npcId);
+        event->trigger(CHANNEL_NPC);
+        break;
+
+    case GPMSG_NPC_CLOSE:
+        event = new Mana::Event(EVENT_CLOSE);
+        event->setInt("id", npcId);
+        event->trigger(CHANNEL_NPC);
+        break;
+    }
 
-        case GPMSG_NPC_STRING:
-            dialog->textRequest("");
-            break;
+    delete event;
+}
 
-        case GPMSG_NPC_POST:
-        {
-            new NpcPostDialog(npcId);
-            break;
-        }
+void NpcHandler::startShopping(int beingId)
+{
+    // TODO
+}
 
-        case GPMSG_NPC_ERROR:
-            dialog->close();
-            if (diag != mNpcDialogs.end())
-            {
-                mNpcDialogs.erase(diag);
-            }
-            break;
-
-        case GPMSG_NPC_MESSAGE:
-            dialog->addText(msg.readString(msg.getUnreadLength()));
-            dialog->showNextButton();
-            break;
-
-        case GPMSG_NPC_CLOSE:
-            dialog->showCloseButton();
-            break;
-    }
+void NpcHandler::buy(int beingId)
+{
+    // TODO
+}
+
+void NpcHandler::sell(int beingId)
+{
+    // TODO
+}
+
+void NpcHandler::buyItem(int beingId, int itemId, int amount)
+{
+    MessageOut msg(PGMSG_NPC_BUYSELL);
+    msg.writeInt16(itemId);
+    msg.writeInt16(amount);
+    gameServerConnection->send(msg);
+}
+
+void NpcHandler::sellItem(int beingId, int itemId, int amount)
+{
+    MessageOut msg(PGMSG_NPC_BUYSELL);
+    msg.writeInt16(itemId);
+    msg.writeInt16(amount);
+    gameServerConnection->send(msg);
+}
+
+void NpcHandler::endShopping(int beingId)
+{
+    // TODO
 }
 
 void NpcHandler::talk(int npcId)
@@ -133,6 +168,10 @@ void NpcHandler::talk(int npcId)
     MessageOut msg(PGMSG_NPC_TALK);
     msg.writeInt16(npcId);
     gameServerConnection->send(msg);
+
+    Mana::Event event(EVENT_TALKSENT);
+    event.setInt("npcId", npcId);
+    event.trigger(CHANNEL_NPC);
 }
 
 void NpcHandler::nextDialog(int npcId)
@@ -140,6 +179,10 @@ void NpcHandler::nextDialog(int npcId)
     MessageOut msg(PGMSG_NPC_TALK_NEXT);
     msg.writeInt16(npcId);
     gameServerConnection->send(msg);
+
+    Mana::Event event(EVENT_NEXTSENT);
+    event.setInt("npcId", npcId);
+    event.trigger(CHANNEL_NPC);
 }
 
 void NpcHandler::closeDialog(int npcId)
@@ -148,20 +191,22 @@ void NpcHandler::closeDialog(int npcId)
     msg.writeInt16(npcId);
     gameServerConnection->send(msg);
 
-    NpcDialogs::iterator it = mNpcDialogs.find(npcId);
-    if (it != mNpcDialogs.end())
-    {
-        (*it).second.dialog->close();
-        mNpcDialogs.erase(it);
-    }
+    Mana::Event event(EVENT_CLOSESENT);
+    event.setInt("npcId", npcId);
+    event.trigger(CHANNEL_NPC);
 }
 
-void NpcHandler::listInput(int npcId, int value)
+void NpcHandler::menuSelect(int npcId, int choice)
 {
     MessageOut msg(PGMSG_NPC_SELECT);
     msg.writeInt16(npcId);
-    msg.writeInt8(value);
+    msg.writeInt8(choice);
     gameServerConnection->send(msg);
+
+    Mana::Event event(EVENT_MENUSENT);
+    event.setInt("npcId", npcId);
+    event.setInt("choice", choice);
+    event.trigger(CHANNEL_NPC);
 }
 
 void NpcHandler::integerInput(int npcId, int value)
@@ -170,6 +215,11 @@ void NpcHandler::integerInput(int npcId, int value)
     msg.writeInt16(npcId);
     msg.writeInt32(value);
     gameServerConnection->send(msg);
+
+    Mana::Event event(EVENT_INTEGERINPUTSENT);
+    event.setInt("npcId", npcId);
+    event.setInt("value", value);
+    event.trigger(CHANNEL_NPC);
 }
 
 void NpcHandler::stringInput(int npcId, const std::string &value)
@@ -178,56 +228,26 @@ void NpcHandler::stringInput(int npcId, const std::string &value)
     msg.writeInt16(npcId);
     msg.writeString(value);
     gameServerConnection->send(msg);
+
+    Mana::Event event(EVENT_STRINGINPUTSENT);
+    event.setInt("npcId", npcId);
+    event.setString("value", value);
+    event.trigger(CHANNEL_NPC);
 }
 
 void NpcHandler::sendLetter(int npcId, const std::string &recipient,
-                            const std::string &text)
+                const std::string &text)
 {
     MessageOut msg(PGMSG_NPC_POST_SEND);
     msg.writeString(recipient);
     msg.writeString(text);
     gameServerConnection->send(msg);
-}
-
-void NpcHandler::startShopping(int beingId)
-{
-    // TODO
-}
-
-void NpcHandler::buy(int beingId)
-{
-    // TODO
-}
-
-void NpcHandler::sell(int beingId)
-{
-    // TODO
-}
 
-void NpcHandler::buyItem(int beingId, int itemId, int amount)
-{
-    MessageOut msg(PGMSG_NPC_BUYSELL);
-    msg.writeInt16(itemId);
-    msg.writeInt16(amount);
-    gameServerConnection->send(msg);
-}
-
-void NpcHandler::sellItem(int beingId, int itemId, int amount)
-{
-    MessageOut msg(PGMSG_NPC_BUYSELL);
-    msg.writeInt16(itemId);
-    msg.writeInt16(amount);
-    gameServerConnection->send(msg);
-}
-
-void NpcHandler::endShopping(int beingId)
-{
-    // TODO
-}
-
-void NpcHandler::clearDialogs()
-{
-    mNpcDialogs.clear();
+    Mana::Event event(EVENT_SENDLETTERSENT);
+    event.setInt("npcId", npcId);
+    event.setString("recipient", recipient);
+    event.setString("text", text);
+    event.trigger(CHANNEL_NPC);
 }
 
 } // namespace ManaServ
diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h
index 689fdc1d..cb8fd67d 100644
--- a/src/net/manaserv/npchandler.h
+++ b/src/net/manaserv/npchandler.h
@@ -22,14 +22,14 @@
 #ifndef NET_MANASERV_NPCHANDLER_H
 #define NET_MANASERV_NPCHANDLER_H
 
+#include "listener.h"
+
 #include "net/npchandler.h"
 
 #include "net/manaserv/messagehandler.h"
 
 #include <map>
 
-class NpcDialog;
-
 namespace ManaServ {
 
 class NpcHandler : public MessageHandler, public Net::NpcHandler
@@ -39,21 +39,6 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
 
         void handleMessage(Net::MessageIn &msg);
 
-        void talk(int npcId);
-
-        void nextDialog(int npcId);
-
-        void closeDialog(int npcId);
-
-        void listInput(int npcId, int value);
-
-        void integerInput(int npcId, int value);
-
-        void stringInput(int npcId, const std::string &value);
-
-        void sendLetter(int npcId, const std::string &recipient,
-                                const std::string &text);
-
         void startShopping(int beingId);
 
         void buy(int beingId);
@@ -66,14 +51,21 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
 
         void endShopping(int beingId);
 
-        void clearDialogs();
+        void talk(int npcId);
+
+        void nextDialog(int npcId);
+
+        void closeDialog(int npcId);
+
+        void menuSelect(int npcId, int choice);
+
+        void integerInput(int npcId, int value);
+
+        void stringInput(int npcId, const std::string &value);
+
+        void sendLetter(int npcId, const std::string &recipient,
+                        const std::string &text);
 
-    private:
-        typedef struct {
-            NpcDialog* dialog;
-        } Wrapper;
-        typedef std::map<int, Wrapper> NpcDialogs;
-        NpcDialogs mNpcDialogs;
 };
 
 } // namespace ManaServ
diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index ec153fa8..b30d5391 100644
--- a/src/net/manaserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -21,17 +21,16 @@
 
 #include "net/manaserv/partyhandler.h"
 
+#include "event.h"
 #include "log.h"
 #include "localplayer.h"
 
 #include "gui/socialwindow.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -85,7 +84,7 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 //
-                localChatTab->chatLog(_("Joined party."));
+                SERVER_NOTICE(_("Joined party."));
             }
         }
 
@@ -103,7 +102,7 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
             int id = msg.readInt16(); // being id
             std::string name = msg.readString();
 
-            localChatTab->chatLog(strprintf(_("%s joined the party."),
+            SERVER_NOTICE(strprintf(_("%s joined the party."),
                                             name.c_str()));
 
             if (id == player_node->getId())
@@ -120,8 +119,8 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
         case CPMSG_PARTY_REJECTED:
         {
             std::string name = msg.readString();
-            localChatTab->chatLog(strprintf(_("%s rejected your invite."),
-                                            name.c_str()));
+            SERVER_NOTICE(strprintf(
+                        _("%s rejected your invite."), name.c_str()));
         } break;
     }
 }
@@ -136,9 +135,9 @@ void PartyHandler::join(int partyId)
     // TODO
 }
 
-void PartyHandler::invite(Player *player)
+void PartyHandler::invite(Being *being)
 {
-    invite(player->getName());
+    invite(being->getName());
 }
 
 void PartyHandler::invite(const std::string &name)
@@ -167,7 +166,7 @@ void PartyHandler::leave()
     chatServerConnection->send(msg);
 }
 
-void PartyHandler::kick(Player *player)
+void PartyHandler::kick(Being *being)
 {
     // TODO
 }
diff --git a/src/net/manaserv/partyhandler.h b/src/net/manaserv/partyhandler.h
index 0777b49e..29dc280d 100644
--- a/src/net/manaserv/partyhandler.h
+++ b/src/net/manaserv/partyhandler.h
@@ -43,7 +43,7 @@ public:
 
     void join(int partyId);
 
-    void invite(Player *player);
+    void invite(Being *being);
 
     void invite(const std::string &name);
 
@@ -51,7 +51,7 @@ public:
 
     void leave();
 
-    void kick(Player *player);
+    void kick(Being *being);
 
     void kick(const std::string &name);
 
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 33367927..c071ca04 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -24,14 +24,14 @@
 
 #include "client.h"
 #include "effectmanager.h"
+#include "event.h"
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
 #include "particle.h"
-#include "npc.h"
+#include "playerinfo.h"
 #include "configuration.h"
 
-#include "gui/chat.h"
 #include "gui/gui.h"
 #include "gui/okdialog.h"
 #include "gui/viewport.h"
@@ -39,10 +39,11 @@
 #include "net/net.h"
 
 #include "net/manaserv/connection.h"
+#include "net/manaserv/defines.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/npchandler.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
+#include "net/manaserv/attributes.h"
 
 /**
  * Max. distance we are willing to scroll after a teleport;
@@ -64,9 +65,7 @@ void RespawnRequestListener::action(const gcn::ActionEvent &event)
 {
     Net::getPlayerHandler()->respawn();
 
-    ManaServ::NpcHandler *handler =
-            static_cast<ManaServ::NpcHandler*>(Net::getNpcHandler());
-    handler->clearDialogs();
+    Mana::Event::trigger(CHANNEL_NPC, EVENT_CLOSEALL);
 }
 
 PlayerHandler::PlayerHandler()
@@ -112,23 +111,24 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
 
         case GPMSG_PLAYER_ATTRIBUTE_CHANGE:
         {
-            logger->log("ATTRIBUTE UPDATE:");
             while (msg.getUnreadLength())
             {
-                int stat = msg.readInt16();
-                int base = msg.readInt16();
-                int value = msg.readInt16();
-                logger->log("%d set to %d %d", stat, base, value);
-
-                if (stat == BASE_ATTR_HP)
+                int attrId = msg.readInt16();
+                double base = msg.readInt32() / 256.0;
+                double value = msg.readInt32() / 256.0;
+
+                // Set the core player attribute the stat
+                // depending on attribute link.
+                int playerInfoId =
+                                  Attributes::getPlayerInfoIdFromAttrId(attrId);
+                if (playerInfoId > -1)
                 {
-                    player_node->setMaxHp(base);
-                    player_node->setHp(value);
+                    PlayerInfo::setAttribute(playerInfoId, value);
                 }
                 else
                 {
-                    player_node->setAttributeBase(stat, base);
-                    player_node->setAttributeEffective(stat, value);
+                    PlayerInfo::setStatBase(attrId, base);
+                    PlayerInfo::setStatMod(attrId, value - base);
                 }
             }
         } break;
@@ -142,33 +142,33 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                 int current = msg.readInt32();
                 int next = msg.readInt32();
 
-                player_node->setExperience(skill, current, next);
+                PlayerInfo::setStatExperience(skill, current, next);
             }
         } break;
 
         case GPMSG_LEVELUP:
         {
-            player_node->setLevel(msg.readInt16());
-            player_node->setCharacterPoints(msg.readInt16());
-            player_node->setCorrectionPoints(msg.readInt16());
+            PlayerInfo::setAttribute(LEVEL, msg.readInt16());
+            PlayerInfo::setAttribute(CHAR_POINTS, msg.readInt16());
+            PlayerInfo::setAttribute(CORR_POINTS, msg.readInt16());
             Particle* effect = particleEngine->addEffect(
-                 paths.getValue("particles", "graphics/particles/")
-               + paths.getValue("levelUpEffectFile", "levelup.particle.xml"),
-                                                         0, 0);
+                                               paths.getStringValue("particles")
+                                     + paths.getStringValue("levelUpEffectFile")
+                                                         ,0, 0);
             player_node->controlParticle(effect);
         } break;
 
 
         case GPMSG_LEVEL_PROGRESS:
         {
-            player_node->setExp(msg.readInt8(), false);
+            PlayerInfo::setAttribute(EXP, msg.readInt8());
         } break;
 
 
         case GPMSG_RAISE_ATTRIBUTE_RESPONSE:
         {
             int errCode = msg.readInt8();
-            int attrNum = msg.readInt8() - CHAR_ATTR_BEGIN;
+            int attrNum = msg.readInt16();
             switch (errCode)
             {
                 case ATTRIBMOD_OK:
@@ -185,18 +185,19 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                     // has to be correct. The server is always right!
                     // undo attribute change and set points to 0
                     logger->log("Warning: Server denied increase of attribute %d (no points left) ", attrNum);
-                    int attrValue = player_node->getAttributeBase(attrNum) - 1;
-                    player_node->setCharacterPoints(0);
-                    player_node->setAttributeBase(attrNum, attrValue);
+                    int attrValue = PlayerInfo::getStatBase(attrNum) - 1;
+                    PlayerInfo::setAttribute(CHAR_POINTS, 0);
+                    PlayerInfo::setStatBase(attrNum, attrValue);
                 } break;
                 case ATTRIBMOD_DENIED:
                 {
                     // undo attribute change
                     logger->log("Warning: Server denied increase of attribute %d (reason unknown) ", attrNum);
-                    int points = player_node->getCharacterPoints() - 1;
-                    player_node->setCharacterPoints(points);
-                    int attrValue = player_node->getAttributeBase(attrNum) - 1;
-                    player_node->setAttributeBase(attrNum, attrValue);
+                    int points = PlayerInfo::getAttribute(CHAR_POINTS) - 1;
+                    PlayerInfo::setAttribute(CHAR_POINTS, points);
+
+                    int attrValue = PlayerInfo::getStatBase(attrNum) - 1;
+                    PlayerInfo::setStatBase(attrNum, attrValue);
                 } break;
             }
         } break;
@@ -204,7 +205,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
         case GPMSG_LOWER_ATTRIBUTE_RESPONSE:
         {
             int errCode = msg.readInt8();
-            int attrNum = msg.readInt8() - CHAR_ATTR_BEGIN;
+            int attrNum = msg.readInt16();
             switch (errCode)
             {
                 case ATTRIBMOD_OK:
@@ -221,21 +222,24 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                     // has to be correct. The server is always right!
                     // undo attribute change and set points to 0
                     logger->log("Warning: Server denied reduction of attribute %d (no points left) ", attrNum);
-                    int attrValue = player_node->getAttributeBase(attrNum) + 1;
-                    player_node->setCorrectionPoints(0);
-                    player_node->setAttributeBase(attrNum, attrValue);
-                    break;
+                    int attrValue = PlayerInfo::getStatBase(attrNum) + 1;
+                    // TODO are these right?
+                    PlayerInfo::setAttribute(CHAR_POINTS, 0);
+                    PlayerInfo::setAttribute(CORR_POINTS, 0);
+                    PlayerInfo::setStatBase(attrNum, attrValue);
                 } break;
                 case ATTRIBMOD_DENIED:
                 {
                     // undo attribute change
                     logger->log("Warning: Server denied reduction of attribute %d (reason unknown) ", attrNum);
-                    int charaPoints = player_node->getCharacterPoints() - 1;
-                    player_node->setCharacterPoints(charaPoints);
-                    int correctPoints = player_node->getCorrectionPoints() + 1;
-                    player_node->setCorrectionPoints(correctPoints);
-                    int attrValue = player_node->getAttributeBase(attrNum) + 1;
-                    player_node->setAttributeBase(attrNum, attrValue);
+                    int charaPoints = PlayerInfo::getAttribute(CHAR_POINTS) - 1;
+                    PlayerInfo::setAttribute(CHAR_POINTS, charaPoints);
+
+                    int correctPoints = PlayerInfo::getAttribute(CORR_POINTS) + 1;
+                    PlayerInfo::setAttribute(CORR_POINTS, correctPoints);
+
+                    int attrValue = PlayerInfo::getStatBase(attrNum) + 1;
+                    PlayerInfo::setStatBase(attrNum, attrValue);
                 } break;
             }
 
@@ -250,7 +254,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                 int current = msg.readInt32();
                 int max = msg.readInt32();
                 int recharge = msg.readInt32();
-                player_node->setSpecialStatus(id, current, max, recharge);
+                PlayerInfo::setSpecialStatus(id, current, max, recharge);
             }
         } break;
         /*
@@ -325,14 +329,14 @@ void PlayerHandler::emote(int emoteId)
 void PlayerHandler::increaseAttribute(int attr)
 {
     MessageOut msg(PGMSG_RAISE_ATTRIBUTE);
-    msg.writeInt8(attr);
+    msg.writeInt16(attr);
     gameServerConnection->send(msg);
 }
 
 void PlayerHandler::decreaseAttribute(int attr)
 {
     MessageOut msg(PGMSG_LOWER_ATTRIBUTE);
-    msg.writeInt8(attr);
+    msg.writeInt16(attr);
     gameServerConnection->send(msg);
 }
 
@@ -343,11 +347,14 @@ void PlayerHandler::increaseSkill(int skillId)
 
 void PlayerHandler::pickUp(FloorItem *floorItem)
 {
-    int id = floorItem->getId();
-    MessageOut msg(PGMSG_PICKUP);
-    msg.writeInt16(id >> 16);
-    msg.writeInt16(id & 0xFFFF);
-    gameServerConnection->send(msg);
+    if (floorItem)
+    {
+        int id = floorItem->getId();
+        MessageOut msg(PGMSG_PICKUP);
+        msg.writeInt16(id >> 16);
+        msg.writeInt16(id & 0xFFFF);
+        gameServerConnection->send(msg);
+    }
 }
 
 void PlayerHandler::setDirection(char direction)
diff --git a/src/net/manaserv/specialhandler.cpp b/src/net/manaserv/specialhandler.cpp
index 144111c2..11d361c8 100644
--- a/src/net/manaserv/specialhandler.cpp
+++ b/src/net/manaserv/specialhandler.cpp
@@ -24,7 +24,7 @@
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 extern Net::SpecialHandler *specialHandler;
 
diff --git a/src/net/manaserv/stats.cpp b/src/net/manaserv/stats.cpp
deleted file mode 100644
index ece0e72a..00000000
--- a/src/net/manaserv/stats.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "net/manaserv/stats.h"
-
-#include "log.h"
-
-#include "gui/statuswindow.h"
-
-#include "resources/itemdb.h"
-
-#include "utils/gettext.h"
-#include "utils/xml.h"
-
-#include <list>
-#include <map>
-
-#define DEFAULT_ATTRIBUTESDB_FILE "attributes.xml"
-
-namespace ManaServ {
-namespace Stats {
-    typedef struct {
-        unsigned int id;
-        std::string name;
-        std::string tag;
-        std::string effect;
-        std::string description;
-        bool modifiable;
-    } Stat;
-
-    typedef std::map<unsigned int, Stat> StatMap;
-    StatMap stats;
-
-    static void loadBuiltins()
-    {
-        {
-            Stat s;
-            s.id = 16;
-            s.name = _("Strength");
-            s.tag = "str";
-            s.effect = _("Strength %+d");
-            s.description = "";
-            s.modifiable = true;
-
-            stats[s.id] = s;
-        }
-
-        {
-            Stat s;
-            s.id = 17;
-            s.name = _("Agility");
-            s.tag = "agi";
-            s.effect = _("Agility %+d");
-            s.description = "";
-            s.modifiable = true;
-
-            stats[s.id] = s;
-        }
-
-        {
-            Stat s;
-            s.id = 18;
-            s.name = _("Dexterity");
-            s.tag = "dex";
-            s.effect = _("Dexterity %+d");
-            s.description = "";
-            s.modifiable = true;
-
-            stats[s.id] = s;
-        }
-
-        {
-            Stat s;
-            s.id = 19;
-            s.name = _("Vitality");
-            s.tag = "vit";
-            s.effect = _("Vitality %+d");
-            s.description = "";
-            s.modifiable = true;
-
-            stats[s.id] = s;
-        }
-
-        {
-            Stat s;
-            s.id = 20;
-            s.name = _("Intelligence");
-            s.tag = "int";
-            s.effect = _("Intelligence %+d");
-            s.description = "";
-            s.modifiable = true;
-
-            stats[s.id] = s;
-        }
-
-        {
-            Stat s;
-            s.id = 21;
-            s.name = _("Willpower");
-            s.tag = "will";
-            s.effect = _("Willpower %+d");
-            s.description = "";
-            s.modifiable = true;
-
-            stats[s.id] = s;
-        }
-    }
-
-    void load()
-    {
-        XML::Document doc(DEFAULT_ATTRIBUTESDB_FILE);
-        xmlNodePtr rootNode = doc.rootNode();
-
-        if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "stats"))
-        {
-            logger->log("Stats: Error while loading "
-                        DEFAULT_ATTRIBUTESDB_FILE ". Using Built-ins.");
-            loadBuiltins();
-            return;
-        }
-
-        for_each_xml_child_node(node, rootNode)
-        {
-            if (!xmlStrEqual(node->name, BAD_CAST "stat"))
-                continue;
-
-            int id = XML::getProperty(node, "id", 0);
-
-            if (id == 0)
-            {
-                logger->log("Stats: Invalid or missing stat ID in "
-                            DEFAULT_ATTRIBUTESDB_FILE "!");
-                continue;
-            }
-            else if (stats.find(id) != stats.end())
-            {
-                logger->log("Stats: Redefinition of stat ID %d", id);
-            }
-
-            std::string name = XML::getProperty(node, "name", "");
-
-            if (name.empty())
-            {
-                logger->log("Stats: Invalid or missing stat name in "
-                            DEFAULT_ATTRIBUTESDB_FILE "!");
-                continue;
-            }
-
-            Stat s;
-            s.id = id;
-            s.name = name;
-            s.tag = XML::getProperty(node, "tag", "");
-            s.effect = XML::getProperty(node, "effect", "");
-            s.description = XML::getProperty(node, "desc", "");
-            s.modifiable = XML::getProperty(node, "modifiable", "false")
-                           == "true";
-
-            stats[id] = s;
-        }
-    }
-
-    void unload()
-    {
-        stats.clear();
-    }
-
-    void informItemDB()
-    {
-        std::list<ItemDB::Stat> dbStats;
-
-        StatMap::const_iterator it, it_end;
-        for (it = stats.begin(), it_end = stats.end(); it != it_end; it++)
-            if (!it->second.tag.empty())
-                dbStats.push_back(ItemDB::Stat(it->second.tag,
-                                               it->second.effect));
-
-        ItemDB::setStatsList(dbStats);
-    }
-
-    void informStatusWindow()
-    {
-        StatMap::const_iterator it, it_end;
-        for (it = stats.begin(), it_end = stats.end(); it != it_end; it++)
-            statusWindow->addAttribute(it->second.id, it->second.name,
-                                       it->second.modifiable,
-                                       it->second.description);
-    }
-
-    std::vector<std::string> getLabelVector()
-    {
-        std::vector<std::string> attributes;
-        StatMap::const_iterator it, it_end;
-        for (it = stats.begin(), it_end = stats.end(); it != it_end; it++)
-            if (it->second.modifiable)
-                attributes.push_back(it->second.name + ":");
-
-        return attributes;
-    }
-} // namespace Stats
-} // namespace ManaServ
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index 234a18d6..6e205e24 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -21,21 +21,21 @@
 
 #include "net/manaserv/tradehandler.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
+#include "event.h"
 #include "item.h"
 #include "localplayer.h"
+#include "playerinfo.h"
 
 #include "gui/confirmdialog.h"
 #include "gui/trade.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/net.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -86,16 +86,15 @@ TradeHandler::TradeHandler():
     };
     handledMessages = _messages;
     tradeHandler = this;
-    
 }
 
 void TradeHandler::setAcceptTradeRequests(bool acceptTradeRequests)
 {
     mAcceptTradeRequests = acceptTradeRequests;
     if (mAcceptTradeRequests)
-        localChatTab->chatLog(_("Accepting incoming trade requests."), BY_SERVER);
+        SERVER_NOTICE(_("Accepting incoming trade requests."))
     else
-        localChatTab->chatLog(_("Ignoring incoming trade requests."), BY_SERVER);
+        SERVER_NOTICE(_("Ignoring incoming trade requests."))
 }
 
 void TradeHandler::handleMessage(Net::MessageIn &msg)
@@ -104,13 +103,13 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
     {
         case GPMSG_TRADE_REQUEST:
         {
-            Being *being = beingManager->findBeing(msg.readInt16());
+            Being *being = actorSpriteManager->findBeing(msg.readInt16());
             if (!being || !mAcceptTradeRequests)
             {
                 respond(false);
                 break;
             }
-            player_node->setTrading(true);
+            PlayerInfo::setTrading(true);
             tradePartnerName = being->getName();
             tradePartnerID = being->getId();
             ConfirmDialog *dlg = new ConfirmDialog(_("Request for Trade"),
@@ -144,19 +143,19 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
         case GPMSG_TRADE_AGREED:
             tradeWindow->receivedOk(false);
             break;
-            
+
         case GPMSG_TRADE_CANCEL:
-            localChatTab->chatLog(_("Trade canceled."), BY_SERVER);
+            SERVER_NOTICE(_("Trade canceled."))
             tradeWindow->setVisible(false);
             tradeWindow->reset();
-            player_node->setTrading(false);
+            PlayerInfo::setTrading(false);
             break;
 
         case GPMSG_TRADE_COMPLETE:
-            localChatTab->chatLog(_("Trade completed."), BY_SERVER);
+            SERVER_NOTICE(_("Trade completed."))
             tradeWindow->setVisible(false);
             tradeWindow->reset();
-            player_node->setTrading(false);
+            PlayerInfo::setTrading(false);
             break;
     }
 }
@@ -177,7 +176,7 @@ void TradeHandler::respond(bool accept)
     gameServerConnection->send(msg);
 
     if (!accept)
-        player_node->setTrading(false);
+        PlayerInfo::setTrading(false);
 }
 
 void TradeHandler::addItem(Item *item, int amount)
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 1b4bbf36..7dae6b35 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -133,17 +133,12 @@ void connectToServer(ServerInfo &server)
     {
         // TODO: Query the server about itself and choose the netcode based on
         // that
-
-#ifndef MANASERV_SUPPORT
-        server.type = ServerInfo::TMWATHENA;
-#else
         if (server.port == 6901)
             server.type = ServerInfo::TMWATHENA;
         else if (server.port == 9601)
             server.type = ServerInfo::MANASERV;
         else
             logger->error(_("Unknown Server Type! Exiting."));
-#endif
     }
 
     if (networkType == server.type && getGeneralHandler() != NULL)
@@ -159,17 +154,14 @@ void connectToServer(ServerInfo &server)
 
         switch (server.type)
         {
-#ifdef MANASERV_SUPPORT
             case ServerInfo::MANASERV:
                 new ManaServ::GeneralHandler;
                 break;
-#endif
             case ServerInfo::TMWATHENA:
                 new TmwAthena::GeneralHandler;
                 break;
-
             default:
-                // Shouldn't happen...
+                logger->error(_("Server protocol unsupported"));
                 break;
         }
 
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index bba8dc31..35535c61 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -29,13 +29,27 @@ namespace Net {
 class NpcHandler
 {
     public:
+        virtual ~NpcHandler() {}
+
+        virtual void startShopping(int beingId) = 0;
+
+        virtual void buy(int beingId) = 0;
+
+        virtual void sell(int beingId) = 0;
+
+        virtual void buyItem(int beingId, int itemId, int amount) = 0;
+
+        virtual void sellItem(int beingId, int itemId, int amount) = 0;
+
+        virtual void endShopping(int beingId) = 0;
+
         virtual void talk(int npcId) = 0;
 
         virtual void nextDialog(int npcId) = 0;
 
         virtual void closeDialog(int npcId) = 0;
 
-        virtual void listInput(int npcId, int value) = 0;
+        virtual void menuSelect(int npcId, int choice) = 0;
 
         virtual void integerInput(int npcId, int value) = 0;
 
@@ -44,19 +58,6 @@ class NpcHandler
         virtual void sendLetter(int npcId, const std::string &recipient,
                                 const std::string &text) = 0;
 
-        virtual void startShopping(int beingId) = 0;
-
-        virtual void buy(int beingId) = 0;
-
-        virtual void sell(int beingId) = 0;
-
-        virtual void buyItem(int beingId, int itemId, int amount) = 0;
-
-        virtual void sellItem(int beingId, int itemId, int amount) = 0;
-
-        virtual void endShopping(int beingId) = 0;
-
-        virtual ~NpcHandler() {}
 };
 
 } // namespace Net
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index dd1103fc..7ca13546 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -24,7 +24,7 @@
 
 #include <string>
 
-class Player;
+class Being;
 
 enum PartyShare {
     PARTY_SHARE_UNKNOWN = -1,
@@ -38,11 +38,13 @@ namespace Net {
 class PartyHandler
 {
     public:
+        virtual ~PartyHandler() {}
+
         virtual void create(const std::string &name = "") = 0;
 
         virtual void join(int partyId) = 0;
 
-        virtual void invite(Player *player) = 0;
+        virtual void invite(Being *player) = 0;
 
         virtual void invite(const std::string &name) = 0;
 
@@ -50,7 +52,7 @@ class PartyHandler
 
         virtual void leave() = 0;
 
-        virtual void kick(Player *player) = 0;
+        virtual void kick(Being *player) = 0;
 
         virtual void kick(const std::string &name) = 0;
 
@@ -69,8 +71,6 @@ class PartyHandler
         // virtual void options() = 0;
 
         // virtual void message() = 0;
-
-        virtual ~PartyHandler() {}
 };
 
 } // namespace Net
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 399afb5e..d7676a92 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -24,13 +24,14 @@
 
 #include "being.h"
 #include "flooritem.h"
-#include "localplayer.h"
 
 namespace Net {
 
 class PlayerHandler
 {
     public:
+        virtual ~PlayerHandler() {}
+
         virtual void attack(int id) = 0;
 
         virtual void emote(int emoteId) = 0;
@@ -62,8 +63,6 @@ class PlayerHandler
         virtual int getJobLocation() = 0;
 
         virtual Vector getDefaultWalkSpeed() = 0;
-
-        virtual ~PlayerHandler() {}
 };
 
 } // namespace Net
diff --git a/src/net/specialhandler.h b/src/net/specialhandler.h
index 21e3a4b7..89fcdf7d 100644
--- a/src/net/specialhandler.h
+++ b/src/net/specialhandler.h
@@ -28,6 +28,8 @@ namespace Net {
 class SpecialHandler
 {
     public:
+        virtual ~SpecialHandler () {}
+
         virtual void use(int id) = 0;
 
         virtual void use(int id, int level, int beingId) = 0;
@@ -35,8 +37,6 @@ class SpecialHandler
         virtual void use(int id, int level, int x, int y) = 0;
 
         virtual void use(int id, const std::string &map) = 0;
-
-        virtual ~SpecialHandler () {}
 };
 }
 
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index e2c3c74b..53e4bfd8 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -21,14 +21,12 @@
 
 #include "net/tmwa/adminhandler.h"
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
+#include "event.h"
 #include "game.h"
-#include "player.h"
 #include "playerrelations.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/chathandler.h"
 #include "net/net.h"
 
@@ -45,7 +43,8 @@ namespace TmwAthena {
 
 AdminHandler::AdminHandler()
 {
-    static const Uint16 _messages[] = {
+    static const Uint16 _messages[] =
+    {
         SMSG_ADMIN_KICK_ACK,
         SMSG_ADMIN_IP,
         0
@@ -62,15 +61,14 @@ void AdminHandler::handleMessage(Net::MessageIn &msg)
         case SMSG_ADMIN_KICK_ACK:
             id = msg.readInt32();
             if (id == 0)
-                localChatTab->chatLog(_("Kick failed!"), BY_SERVER);
+                SERVER_NOTICE(_("Kick failed!"))
             else
-                localChatTab->chatLog(_("Kick succeeded!"), BY_SERVER);
+                SERVER_NOTICE(_("Kick succeeded!"))
             break;
         case SMSG_ADMIN_IP:
             id = msg.readInt32();
             int ip = msg.readInt32();
-            Being *being = beingManager->findBeing(id);
-            if (Player *player = dynamic_cast<Player *>(being))
+            if (Being *player = actorSpriteManager->findBeing(id))
             {
                 player->setIp(ip);
                 player->updateName();
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 2fe962c7..61491692 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -21,31 +21,30 @@
 
 #include "net/tmwa/beinghandler.h"
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
 #include "client.h"
 #include "effectmanager.h"
 #include "guild.h"
 #include "localplayer.h"
 #include "log.h"
-#include "npc.h"
 #include "party.h"
 #include "playerrelations.h"
 
 #include "net/tmwa/protocol.h"
 
 #include "resources/colordb.h"
+#include "resources/emotedb.h"
 
 #include <iostream>
 
 namespace TmwAthena {
 
-const int EMOTION_TIME = 150;    /**< Duration of emotion icon */
-
 BeingHandler::BeingHandler(bool enableSync):
    mSync(enableSync)
 {
-    static const Uint16 _messages[] = {
+    static const Uint16 _messages[] =
+    {
         SMSG_BEING_VISIBLE,
         SMSG_BEING_MOVE,
         SMSG_BEING_SPAWN,
@@ -75,19 +74,19 @@ BeingHandler::BeingHandler(bool enableSync):
 
 Being *createBeing(int id, short job)
 {
-    Being::Type type = Being::UNKNOWN;
+    ActorSprite::Type type = ActorSprite::UNKNOWN;
     if (job <= 25 || (job >= 4001 && job <= 4049))
-        type = Being::PLAYER;
+        type = ActorSprite::PLAYER;
     else if (job >= 46 && job <= 1000)
-        type = Being::NPC;
+        type = ActorSprite::NPC;
     else if (job > 1000 && job <= 2000)
-        type = Being::MONSTER;
+        type = ActorSprite::MONSTER;
     else if (job == 45)
         return NULL; // Skip portals
 
-    Being *being = beingManager->createBeing(id, type, job);
+    Being *being = actorSpriteManager->createBeing(id, type, job);
 
-    if (type == Being::PLAYER || type == Being::NPC)
+    if (type == ActorSprite::PLAYER || type == ActorSprite::NPC)
     {
         MessageOut outMsg(0x0094);
         outMsg.writeInt32(id);//readLong(2));
@@ -98,7 +97,7 @@ Being *createBeing(int id, short job)
 
 void BeingHandler::handleMessage(Net::MessageIn &msg)
 {
-    if (!beingManager)
+    if (!actorSpriteManager)
         return;
 
     int id;
@@ -113,7 +112,6 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
     int type, guild;
     Uint16 status;
     Being *srcBeing, *dstBeing;
-    Player *player = 0;
     int hairStyle, hairColor, flag;
 
     switch (msg.getId())
@@ -128,7 +126,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
             statusEffects |= ((Uint32)msg.readInt16()) << 16;  // option
             job = msg.readInt16();  // class
 
-            dstBeing = beingManager->findBeing(id);
+            dstBeing = actorSpriteManager->findBeing(id);
 
             if (!dstBeing)
             {
@@ -145,14 +143,10 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
                     break;
             }
 
-            if (dstBeing->getType() == Being::PLAYER)
-                player = static_cast<Player*>(dstBeing);
-
-            if (msg.getId() == 0x0078)
+            if (msg.getId() == SMSG_BEING_VISIBLE)
             {
                 dstBeing->clearPath();
-                dstBeing->setFrame(0);
-                dstBeing->setWalkTime(tick_time);
+                dstBeing->setActionTime(tick_time);
                 dstBeing->setAction(Being::STAND);
             }
 
@@ -178,16 +172,13 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
             shoes = msg.readInt16();  // clothes color - "abused" as shoes
             gloves = msg.readInt16();  // head dir - "abused" as gloves
             guild = msg.readInt32();  // guild
-            if (player)
+            if (guild == 0)
             {
-                if (guild == 0)
-                {
-                    player->clearGuilds();
-                }
-                else
-                {
-                    player->addGuild(Guild::getGuild(guild));
-                }
+                dstBeing->clearGuilds();
+            }
+            else
+            {
+                dstBeing->addGuild(Guild::getGuild(guild));
             }
             msg.readInt16();  // guild emblem
             msg.readInt16();  // manner
@@ -195,19 +186,19 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
             msg.readInt8();   // karma
             gender = msg.readInt8();
 
-            if (player)
+            if (dstBeing->getType() == ActorSprite::PLAYER)
             {
-                player->setGender((gender == 0)
-                                  ? GENDER_FEMALE : GENDER_MALE);
+                dstBeing->setGender((gender == 0)
+                                    ? GENDER_FEMALE : GENDER_MALE);
                 // Set these after the gender, as the sprites may be gender-specific
-                player->setSprite(SPRITE_HAIR, hairStyle * -1, ColorDB::get(hairColor));
-                player->setSprite(SPRITE_BOTTOMCLOTHES, headBottom);
-                player->setSprite(SPRITE_TOPCLOTHES, headMid);
-                player->setSprite(SPRITE_HAT, headTop);
-                player->setSprite(SPRITE_SHOE, shoes);
-                player->setSprite(SPRITE_GLOVES, gloves);
-                player->setSprite(SPRITE_WEAPON, weapon, "", true);
-                player->setSprite(SPRITE_SHIELD, shield);
+                dstBeing->setSprite(SPRITE_HAIR, hairStyle * -1, ColorDB::get(hairColor));
+                dstBeing->setSprite(SPRITE_BOTTOMCLOTHES, headBottom);
+                dstBeing->setSprite(SPRITE_TOPCLOTHES, headMid);
+                dstBeing->setSprite(SPRITE_HAT, headTop);
+                dstBeing->setSprite(SPRITE_SHOE, shoes);
+                dstBeing->setSprite(SPRITE_GLOVES, gloves);
+                dstBeing->setSprite(SPRITE_WEAPON, weapon, "", true);
+                dstBeing->setSprite(SPRITE_SHIELD, shield);
             }
 
             if (msg.getId() == SMSG_BEING_MOVE)
@@ -249,11 +240,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
              * later versions of eAthena for both mobs and
              * players
              */
-            dstBeing = beingManager->findBeing(msg.readInt32());
-
-            Uint16 srcX, srcY, dstX, dstY;
-            msg.readCoordinatePair(srcX, srcY, dstX, dstY);
-            msg.readInt32();  // Server tick
+            dstBeing = actorSpriteManager->findBeing(msg.readInt32());
 
             /*
              * This packet doesn't have enough info to actually
@@ -261,21 +248,23 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
              * we'll just pretend the packet didn't happen
              */
 
-            if (dstBeing)
-            {
-                dstBeing->setAction(Being::STAND);
-                dstBeing->setTileCoords(srcX, srcY);
-                dstBeing->setDestination(dstX, dstY);
-            }
+            if (!dstBeing)
+                break;
+
+            Uint16 srcX, srcY, dstX, dstY;
+            msg.readCoordinatePair(srcX, srcY, dstX, dstY);
+            msg.readInt32();  // Server tick
+
+            dstBeing->setAction(Being::STAND);
+            dstBeing->setTileCoords(srcX, srcY);
+            dstBeing->setDestination(dstX, dstY);
 
             break;
 
         case SMSG_BEING_REMOVE:
             // A being should be removed or has died
             id = msg.readInt32();
-
-            dstBeing = beingManager->findBeing(id);
-
+            dstBeing = actorSpriteManager->findBeing(id);
             if (!dstBeing)
                 break;
 
@@ -286,16 +275,14 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == 1)
                 dstBeing->setAction(Being::DEAD);
             else
-                beingManager->destroyBeing(dstBeing);
+                actorSpriteManager->destroy(dstBeing);
 
             break;
 
         case SMSG_BEING_RESURRECT:
             // A being changed mortality status
             id = msg.readInt32();
-
-            dstBeing = beingManager->findBeing(id);
-
+            dstBeing = actorSpriteManager->findBeing(id);
             if (!dstBeing)
                 break;
 
@@ -310,8 +297,8 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
 
         case SMSG_SKILL_DAMAGE:
             msg.readInt16(); // Skill Id
-            srcBeing = beingManager->findBeing(msg.readInt32());
-            dstBeing = beingManager->findBeing(msg.readInt32());
+            srcBeing = actorSpriteManager->findBeing(msg.readInt32());
+            dstBeing = actorSpriteManager->findBeing(msg.readInt32());
             msg.readInt32(); // Server tick
             msg.readInt32(); // src speed
             msg.readInt32(); // dst speed
@@ -326,8 +313,8 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
             break;
 
         case SMSG_BEING_ACTION:
-            srcBeing = beingManager->findBeing(msg.readInt32());
-            dstBeing = beingManager->findBeing(msg.readInt32());
+            srcBeing = actorSpriteManager->findBeing(msg.readInt32());
+            dstBeing = actorSpriteManager->findBeing(msg.readInt32());
             msg.readInt32();   // server tick
             msg.readInt32();   // src speed
             msg.readInt32();   // dst speed
@@ -354,7 +341,6 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
                 case 0x02: // Sit
                     if (srcBeing)
                     {
-                        srcBeing->setFrame(0);
                         srcBeing->setAction(Being::SIT);
                     }
                     break;
@@ -362,37 +348,36 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
                 case 0x03: // Stand up
                     if (srcBeing)
                     {
-                        srcBeing->setFrame(0);
                         srcBeing->setAction(Being::STAND);
                     }
                     break;
             }
             break;
 
-        case SMSG_BEING_SELFEFFECT: {
+        case SMSG_BEING_SELFEFFECT:
+        {
             id = (Uint32)msg.readInt32();
-            if (!beingManager->findBeing(id))
+            Being* being = actorSpriteManager->findBeing(id);
+            if (!being)
                 break;
 
             int effectType = msg.readInt32();
-            Being* being = beingManager->findBeing(id);
 
             effectManager->trigger(effectType, being);
-
             break;
         }
 
         case SMSG_BEING_EMOTION:
-            if (!(dstBeing = beingManager->findBeing(msg.readInt32())))
+            if (!(dstBeing = actorSpriteManager->findBeing(msg.readInt32())))
             {
                 break;
             }
 
             if (player_relations.hasPermission(dstBeing, PlayerRelation::EMOTE))
             {
-                // only set emote if one doesnt already exist
-                if (!dstBeing->getEmotion())
-                    dstBeing->setEmote(msg.readInt8(), EMOTION_TIME);
+                const int fx = EmoteDB::get(msg.readInt8())->effect;
+                //TODO: figure out why the -1 is needed
+                effectManager->trigger(fx - 1, dstBeing);
             }
 
             break;
@@ -412,14 +397,11 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
              * 16 bit value will be 0.
              */
 
-            if (!(dstBeing = beingManager->findBeing(msg.readInt32())))
+            if (!(dstBeing = actorSpriteManager->findBeing(msg.readInt32())))
             {
                 break;
             }
 
-            if (dstBeing->getType() == Being::PLAYER)
-                player = static_cast<Player*>(dstBeing);
-
             int type = msg.readInt8();
             int id = 0;
             int id2 = 0;
@@ -437,41 +419,41 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
             switch (type)
             {
                 case 1:     // eAthena LOOK_HAIR
-                    player->setSpriteID(SPRITE_HAIR, id *-1);
+                    dstBeing->setSpriteID(SPRITE_HAIR, id *-1);
                     break;
                 case 2:     // Weapon ID in id, Shield ID in id2
-                    player->setSprite(SPRITE_WEAPON, id, "", true);
-                    player->setSprite(SPRITE_SHIELD, id2);
+                    dstBeing->setSprite(SPRITE_WEAPON, id, "", true);
+                    dstBeing->setSprite(SPRITE_SHIELD, id2);
                     break;
                 case 3:     // Change lower headgear for eAthena, pants for us
-                    player->setSprite(SPRITE_BOTTOMCLOTHES, id);
+                    dstBeing->setSprite(SPRITE_BOTTOMCLOTHES, id);
                     break;
                 case 4:     // Change upper headgear for eAthena, hat for us
-                    player->setSprite(SPRITE_HAT, id);
+                    dstBeing->setSprite(SPRITE_HAT, id);
                     break;
                 case 5:     // Change middle headgear for eathena, armor for us
-                    player->setSprite(SPRITE_TOPCLOTHES, id);
+                    dstBeing->setSprite(SPRITE_TOPCLOTHES, id);
                     break;
                 case 6:     // eAthena LOOK_HAIR_COLOR
-                    player->setSpriteColor(SPRITE_HAIR, ColorDB::get(id));
+                    dstBeing->setSpriteColor(SPRITE_HAIR, ColorDB::get(id));
                     break;
                 case 8:     // eAthena LOOK_SHIELD
-                    player->setSprite(SPRITE_SHIELD, id);
+                    dstBeing->setSprite(SPRITE_SHIELD, id);
                     break;
                 case 9:     // eAthena LOOK_SHOES
-                    player->setSprite(SPRITE_SHOE, id);
+                    dstBeing->setSprite(SPRITE_SHOE, id);
                     break;
                 case 10:   // LOOK_GLOVES
-                    player->setSprite(SPRITE_GLOVES, id);
+                    dstBeing->setSprite(SPRITE_GLOVES, id);
                     break;
                 case 11:  // LOOK_CAPE
-                    player->setSprite(SPRITE_CAPE, id);
+                    dstBeing->setSprite(SPRITE_CAPE, id);
                     break;
                 case 12:
-                    player->setSprite(SPRITE_MISC1, id);
+                    dstBeing->setSprite(SPRITE_MISC1, id);
                     break;
                 case 13:
-                    player->setSprite(SPRITE_MISC2, id);
+                    dstBeing->setSprite(SPRITE_MISC2, id);
                     break;
                 default:
                     logger->log("SMSG_BEING_CHANGE_LOOKS: unsupported type: "
@@ -482,13 +464,13 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
             break;
 
         case SMSG_BEING_NAME_RESPONSE:
-            if ((dstBeing = beingManager->findBeing(msg.readInt32())))
+            if ((dstBeing = actorSpriteManager->findBeing(msg.readInt32())))
             {
                 dstBeing->setName(msg.readString(24));
             }
             break;
         case SMSG_PLAYER_GUILD_PARTY_INFO:
-            if ((dstBeing = beingManager->findBeing(msg.readInt32())))
+            if ((dstBeing = actorSpriteManager->findBeing(msg.readInt32())))
             {
                 dstBeing->setPartyName(msg.readString(24));
                 dstBeing->setGuildName(msg.readString(24));
@@ -497,7 +479,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
             }
             break;
         case SMSG_BEING_CHANGE_DIRECTION:
-            if (!(dstBeing = beingManager->findBeing(msg.readInt32())))
+            if (!(dstBeing = actorSpriteManager->findBeing(msg.readInt32())))
             {
                 break;
             }
@@ -520,7 +502,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
                 << 16; // status.options; Aethyra uses this as misc2
             job = msg.readInt16();
 
-            dstBeing = beingManager->findBeing(id);
+            dstBeing = actorSpriteManager->findBeing(id);
 
             if (!dstBeing)
             {
@@ -530,13 +512,10 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
                     break;
             }
 
-            if (dstBeing->getType() == Being::PLAYER)
-                player = static_cast<Player*>(dstBeing);
-
             if (Party *party = player_node->getParty()){
                 if (party->isMember(id))
                 {
-                    player->setParty(party);
+                    dstBeing->setParty(party);
                 }
             }
 
@@ -562,21 +541,21 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
             msg.readInt16();  // manner
             dstBeing->setStatusEffectBlock(32, msg.readInt16());  // opt3
             msg.readInt8();   // karma
-            player->setGender((msg.readInt8() == 0)
+            dstBeing->setGender((msg.readInt8() == 0)
                               ? GENDER_FEMALE : GENDER_MALE);
 
             // Set these after the gender, as the sprites may be gender-specific
-            player->setSprite(SPRITE_WEAPON, weapon, "", true);
-            player->setSprite(SPRITE_SHIELD, shield);
-            //player->setSprite(SPRITE_SHOE, shoes);
-            player->setSprite(SPRITE_BOTTOMCLOTHES, headBottom);
-            player->setSprite(SPRITE_TOPCLOTHES, headMid);
-            player->setSprite(SPRITE_HAT, headTop);
-            //player->setSprite(SPRITE_GLOVES, gloves);
-            //player->setSprite(SPRITE_CAPE, cape);
-            //player->setSprite(SPRITE_MISC1, misc1);
-            //player->setSprite(SPRITE_MISC2, misc2);
-            player->setSprite(SPRITE_HAIR, hairStyle * -1, ColorDB::get(hairColor));
+            dstBeing->setSprite(SPRITE_WEAPON, weapon, "", true);
+            dstBeing->setSprite(SPRITE_SHIELD, shield);
+            //dstBeing->setSprite(SPRITE_SHOE, shoes);
+            dstBeing->setSprite(SPRITE_BOTTOMCLOTHES, headBottom);
+            dstBeing->setSprite(SPRITE_TOPCLOTHES, headMid);
+            dstBeing->setSprite(SPRITE_HAT, headTop);
+            //dstBeing->setSprite(SPRITE_GLOVES, gloves);
+            //dstBeing->setSprite(SPRITE_CAPE, cape);
+            //dstBeing->setSprite(SPRITE_MISC1, misc1);
+            //dstBeing->setSprite(SPRITE_MISC2, misc2);
+            dstBeing->setSprite(SPRITE_HAIR, hairStyle * -1, ColorDB::get(hairColor));
 
             if (msg.getId() == SMSG_PLAYER_MOVE)
             {
@@ -596,7 +575,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
 
             gmstatus = msg.readInt16();
             if (gmstatus & 0x80)
-                player->setGM(true);
+                dstBeing->setGM(true);
 
             if (msg.getId() == SMSG_PLAYER_UPDATE_1)
             {
@@ -619,8 +598,8 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
             msg.readInt8();   // Lv
             msg.readInt8();   // unknown
 
-            dstBeing->setWalkTime(tick_time);
-            dstBeing->setFrame(0);
+            dstBeing->setActionTime(tick_time);
+            dstBeing->reset();
 
             dstBeing->setStunMode(stunMode);
             dstBeing->setStatusEffectBlock(0, (statusEffects >> 16) & 0xffff);
@@ -643,18 +622,15 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
             id = msg.readInt32();
             if (mSync || id != player_node->getId())
             {
-                dstBeing = beingManager->findBeing(id);
+                dstBeing = actorSpriteManager->findBeing(id);
                 if (dstBeing)
                 {
                     Uint16 x, y;
                     x = msg.readInt16();
                     y = msg.readInt16();
                     dstBeing->setTileCoords(x, y);
-                    if (dstBeing->getCurrentAction() == Being::WALK)
-                    {
-                        dstBeing->setFrame(0);
+                    if (dstBeing->getCurrentAction() == Being::MOVE)
                         dstBeing->setAction(Being::STAND);
-                    }
                 }
             }
             break;
@@ -671,18 +647,18 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
         case SMSG_PLAYER_STATUS_CHANGE:
             // Change in players' flags
             id = msg.readInt32();
-            dstBeing = beingManager->findBeing(id);
+            dstBeing = actorSpriteManager->findBeing(id);
+            if (!dstBeing)
+                break;
+
             stunMode = msg.readInt16();
             statusEffects = msg.readInt16();
             statusEffects |= ((Uint32) msg.readInt16()) << 16;
-            msg.readInt8();
+            msg.readInt8(); // Unused?
 
-            if (dstBeing)
-            {
-                dstBeing->setStunMode(stunMode);
-                dstBeing->setStatusEffectBlock(0, (statusEffects >> 16) & 0xffff);
-                dstBeing->setStatusEffectBlock(16, statusEffects & 0xffff);
-            }
+            dstBeing->setStunMode(stunMode);
+            dstBeing->setStatusEffectBlock(0, (statusEffects >> 16) & 0xffff);
+            dstBeing->setStatusEffectBlock(16, statusEffects & 0xffff);
             break;
 
         case SMSG_BEING_STATUS_CHANGE:
@@ -691,7 +667,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
             id = msg.readInt32();
             flag = msg.readInt8(); // 0: stop, 1: start
 
-            dstBeing = beingManager->findBeing(id);
+            dstBeing = actorSpriteManager->findBeing(id);
             if (dstBeing)
                 dstBeing->setStatusEffect(status, flag);
             break;
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 209f034d..5368ba9d 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -21,18 +21,17 @@
 
 #include "net/tmwa/buysellhandler.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
+#include "event.h"
 #include "inventory.h"
 #include "item.h"
 #include "localplayer.h"
-#include "npc.h"
+#include "playerinfo.h"
 
 #include "gui/buy.h"
 #include "gui/buysell.h"
 #include "gui/sell.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/messagein.h"
 
 #include "net/tmwa/protocol.h"
@@ -62,7 +61,7 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case SMSG_NPC_BUY_SELL_CHOICE:
-            if (!BuySellDialog::isActive())
+            if (PlayerInfo::getBuySellState() != BUYSELL_CHOOSING)
             {
                 mNpcId = msg.readInt32();
                 new BuySellDialog(mNpcId);
@@ -73,7 +72,7 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
             msg.readInt16();  // length
             n_items = (msg.getLength() - 4) / 11;
             mBuyDialog = new BuyDialog(mNpcId);
-            mBuyDialog->setMoney(player_node->getMoney());
+            mBuyDialog->setMoney(PlayerInfo::getAttribute(MONEY));
 
             for (int k = 0; k < n_items; k++)
             {
@@ -91,7 +90,7 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
             if (n_items > 0)
             {
                 SellDialog *dialog = new SellDialog(mNpcId);
-                dialog->setMoney(player_node->getMoney());
+                dialog->setMoney(PlayerInfo::getAttribute(MONEY));
 
                 for (int k = 0; k < n_items; k++)
                 {
@@ -99,7 +98,7 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
                     int value = msg.readInt32();
                     msg.readInt32();  // OCvalue
 
-                    Item *item = player_node->getInventory()->getItem(index);
+                    Item *item = PlayerInfo::getInventory()->getItem(index);
 
                     if (item && !(item->isEquipped()))
                         dialog->addItem(item, value);
@@ -107,29 +106,29 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
             }
             else
             {
-                localChatTab->chatLog(_("Nothing to sell."), BY_SERVER);
+                SERVER_NOTICE(_("Nothing to sell."))
             }
             break;
 
         case SMSG_NPC_BUY_RESPONSE:
             if (msg.readInt8() == 0)
             {
-                localChatTab->chatLog(_("Thanks for buying."), BY_SERVER);
+                SERVER_NOTICE(_("Thanks for buying."))
             }
             else
             {
                 // Reset player money since buy dialog already assumed purchase
                 // would go fine
-                mBuyDialog->setMoney(player_node->getMoney());
-                localChatTab->chatLog(_("Unable to buy."), BY_SERVER);
+                mBuyDialog->setMoney(PlayerInfo::getAttribute(MONEY));
+                SERVER_NOTICE(_("Unable to buy."))
             }
             break;
 
         case SMSG_NPC_SELL_RESPONSE:
             if (msg.readInt8() == 0)
-                localChatTab->chatLog(_("Thanks for selling."), BY_SERVER);
+                SERVER_NOTICE(_("Thanks for selling."))
             else
-                localChatTab->chatLog(_("Unable to sell."), BY_SERVER);
+                SERVER_NOTICE(_("Unable to sell."))
 
             break;
     }
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index dc9b3108..1063ee39 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -86,12 +86,10 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg)
                 for (int i = 0; i < count; ++i)
                 {
                     Net::Character *character = new Net::Character;
-                    int slot;
-                    character->dummy = readPlayerData(msg, &slot);
-                    character->slot = slot;
+                    readPlayerData(msg, character);
                     mCharacters.push_back(character);
                     logger->log("CharServer: Player: %s (%d)",
-                                character->dummy->getName().c_str(), slot);
+                                character->dummy->getName().c_str(), character->slot);
                 }
 
                 Client::setState(STATE_CHAR_SELECT);
@@ -118,9 +116,7 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg)
         case SMSG_CHAR_CREATE_SUCCEEDED:
             {
                 Net::Character *character = new Net::Character;
-                int slot;
-                character->dummy = readPlayerData(msg, &slot);
-                character->slot = slot;
+                readPlayerData(msg, character);
                 mCharacters.push_back(character);
 
                 updateCharSelectDialog();
@@ -165,6 +161,8 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg)
 
             // Prevent the selected local player from being deleted
             player_node = mSelectedCharacter->dummy;
+            PlayerInfo::setBackend(mSelectedCharacter->data);
+
             mSelectedCharacter->dummy = 0;
 
             delete_all(mCharacters);
@@ -194,7 +192,7 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg)
     }
 }
 
-LocalPlayer *CharServerHandler::readPlayerData(Net::MessageIn &msg, int *slot)
+void CharServerHandler::readPlayerData(Net::MessageIn &msg, Net::Character *character)
 {
     const Token &token =
             static_cast<LoginHandler*>(Net::getLoginHandler())->getToken();
@@ -202,30 +200,37 @@ LocalPlayer *CharServerHandler::readPlayerData(Net::MessageIn &msg, int *slot)
     LocalPlayer *tempPlayer = new LocalPlayer(msg.readInt32(), 0);
     tempPlayer->setGender(token.sex);
 
-    tempPlayer->setExp(msg.readInt32());
-    tempPlayer->setMoney(msg.readInt32());
-    tempPlayer->setExperience(JOB, msg.readInt32(), 1);
+    character->data.mAttributes[EXP] = msg.readInt32();
+    character->data.mAttributes[MONEY] = msg.readInt32();
+    character->data.mStats[JOB].exp = msg.readInt32();
+
     int temp = msg.readInt32();
-    tempPlayer->setAttributeBase(JOB, temp, false);
-    tempPlayer->setAttributeEffective(JOB, temp);
+    character->data.mStats[JOB].base = temp;
+    character->data.mStats[JOB].mod = temp;
+
     tempPlayer->setSprite(SPRITE_SHOE, msg.readInt16());
     tempPlayer->setSprite(SPRITE_GLOVES, msg.readInt16());
     tempPlayer->setSprite(SPRITE_CAPE, msg.readInt16());
     tempPlayer->setSprite(SPRITE_MISC1, msg.readInt16());
+
     msg.readInt32();                       // option
     msg.readInt32();                       // karma
     msg.readInt32();                       // manner
     msg.skip(2);                          // unknown
-    tempPlayer->setHp(msg.readInt16());
-    tempPlayer->setMaxHp(msg.readInt16());
-    tempPlayer->setMP(msg.readInt16());
-    tempPlayer->setMaxMP(msg.readInt16());
+
+    character->data.mAttributes[HP] = msg.readInt16();
+    character->data.mAttributes[MAX_HP] = msg.readInt16();
+    character->data.mAttributes[MP] = msg.readInt16();
+    character->data.mAttributes[MAX_MP] = msg.readInt16();
+
     msg.readInt16();                       // speed
     tempPlayer->setSubtype(msg.readInt16()); // class (used for race)
     int hairStyle = msg.readInt16();
     Uint16 weapon = msg.readInt16();
     tempPlayer->setSprite(SPRITE_WEAPON, weapon, "", true);
-    tempPlayer->setLevel(msg.readInt16());
+
+    character->data.mAttributes[LEVEL] = msg.readInt16();
+
     msg.readInt16();                       // skill point
     tempPlayer->setSprite(SPRITE_BOTTOMCLOTHES, msg.readInt16()); // head bottom
     tempPlayer->setSprite(SPRITE_SHIELD, msg.readInt16());
@@ -234,12 +239,14 @@ LocalPlayer *CharServerHandler::readPlayerData(Net::MessageIn &msg, int *slot)
     tempPlayer->setSprite(SPRITE_HAIR, hairStyle * -1, ColorDB::get(msg.readInt16()));
     tempPlayer->setSprite(SPRITE_MISC2, msg.readInt16());
     tempPlayer->setName(msg.readString(24));
+
+    character->dummy = tempPlayer;
+
     for (int i = 0; i < 6; i++)
-        tempPlayer->setAttributeBase(i + STR, msg.readInt8(), false);
-    *slot = msg.readInt8(); // character slot
-    msg.readInt8();                        // unknown
+        character->data.mStats[i + STR].base = msg.readInt8();
 
-    return tempPlayer;
+    character->slot = msg.readInt8(); // character slot
+    msg.readInt8();                        // unknown
 }
 
 void CharServerHandler::setCharSelectDialog(CharSelectDialog *window)
@@ -315,17 +322,17 @@ void CharServerHandler::switchCharacter()
     outMsg.writeInt8(1);
 }
 
-int CharServerHandler::baseSprite() const
+unsigned int CharServerHandler::baseSprite() const
 {
     return SPRITE_BASE;
 }
 
-int CharServerHandler::hairSprite() const
+unsigned int CharServerHandler::hairSprite() const
 {
     return SPRITE_HAIR;
 }
 
-int CharServerHandler::maxSprite() const
+unsigned int CharServerHandler::maxSprite() const
 {
     return SPRITE_VECTOREND;
 }
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index e80d22c4..2076cbae 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -63,16 +63,16 @@ class CharServerHandler : public MessageHandler, public Net::CharHandler
 
         void switchCharacter();
 
-        int baseSprite() const;
+        unsigned int baseSprite() const;
 
-        int hairSprite() const;
+        unsigned int hairSprite() const;
 
-        int maxSprite() const;
+        unsigned int maxSprite() const;
 
         void connect();
 
     private:
-        LocalPlayer *readPlayerData(Net::MessageIn &msg, int *slot);
+        void readPlayerData(Net::MessageIn &msg, Net::Character *character);
 };
 
 } // namespace TmwAthena
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 00d29662..33826762 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -21,14 +21,13 @@
 
 #include "net/tmwa/chathandler.h"
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
+#include "event.h"
 #include "game.h"
 #include "localplayer.h"
 #include "playerrelations.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/messagein.h"
 #include "net/messageout.h"
 
@@ -60,8 +59,6 @@ ChatHandler::ChatHandler()
 
 void ChatHandler::handleMessage(Net::MessageIn &msg)
 {
-    if (!localChatTab) return;
-
     Being *being;
     std::string chatMsg;
     std::string nick;
@@ -70,19 +67,36 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case SMSG_WHISPER_RESPONSE:
+            if (mSentWhispers.empty())
+                nick = "user";
+            else
+            {
+                nick = mSentWhispers.front();
+                mSentWhispers.pop();
+            }
+
             switch (msg.readInt8())
             {
                 case 0x00:
-                    // comment out since we'll local echo in chat.cpp instead, then only report failures
-                    //localChatTab->chatLog("Whisper sent", BY_SERVER);
+                    // Success (don't need to report)
                     break;
                 case 0x01:
-                    localChatTab->chatLog(_("Whisper could not be sent, user "
-                                            "is offline."), BY_SERVER);
+                    {
+                        Mana::Event event(EVENT_WHISPERERROR);
+                        event.setString("nick", nick);
+                        event.setString("error", strprintf(_("Whisper could "
+                                  "not be sent, %s is offline."), nick.c_str()));
+                        event.trigger(CHANNEL_CHAT);
+                    }
                     break;
                 case 0x02:
-                    localChatTab->chatLog(_("Whisper could not be sent, "
-                                            "ignored by user."), BY_SERVER);
+                    {
+                        Mana::Event event(EVENT_WHISPERERROR);
+                        event.setString("nick", nick);
+                        event.setString("error", strprintf(_("Whisper could "
+                                 "not be sent, ignored by %s."), nick.c_str()));
+                        event.Event::trigger(CHANNEL_CHAT);
+                    }
                     break;
             }
             break;
@@ -100,11 +114,16 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
             if (nick != "Server")
             {
                 if (player_relations.hasPermission(nick, PlayerRelation::WHISPER))
-                    chatWindow->whisper(nick, chatMsg);
+                {
+                    Mana::Event event(EVENT_WHISPER);
+                    event.setString("nick", nick);
+                    event.setString("message", chatMsg);
+                    event.trigger(CHANNEL_CHAT);
+                }
             }
             else
             {
-                localChatTab->chatLog(chatMsg, BY_SERVER);
+                SERVER_NOTICE(chatMsg)
             }
 
             break;
@@ -113,7 +132,8 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
         case SMSG_BEING_CHAT:
         {
             chatMsgLength = msg.readInt16() - 8;
-            being = beingManager->findBeing(msg.readInt32());
+            int beingId = msg.readInt32();
+            being = actorSpriteManager->findBeing(beingId);
 
             if (!being || chatMsgLength <= 0)
                 break;
@@ -135,23 +155,33 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
                 chatMsg.erase(0, pos + 3);
             }
 
-            trim(chatMsg);
+            int perms;
 
-            // We use getIgnorePlayer instead of ignoringPlayer here
-            // because ignorePlayer' side effects are triggered
-            // right below for Being::IGNORE_SPEECH_FLOAT.
-            if (player_relations.checkPermissionSilently(sender_name,
-                PlayerRelation::SPEECH_LOG) && chatWindow)
+            if (being->getType() == Being::PLAYER)
             {
-                localChatTab->chatLog(removeColors(sender_name) + " : "
-                                      + chatMsg, BY_OTHER);
+                perms = player_relations.checkPermissionSilently(sender_name,
+                    PlayerRelation::SPEECH_LOG | PlayerRelation::SPEECH_FLOAT);
             }
-
-            if (player_relations.hasPermission(sender_name,
-                PlayerRelation::SPEECH_FLOAT))
+            else
             {
-                being->setSpeech(chatMsg, SPEECH_TIME);
+                perms = player_relations.getDefault()
+                        & (PlayerRelation::SPEECH_LOG
+                           | PlayerRelation::SPEECH_FLOAT);
             }
+
+            trim(chatMsg);
+
+            std::string reducedMessage = chatMsg;
+            chatMsg = removeColors(sender_name) + " : " + reducedMessage;
+
+            Mana::Event event(EVENT_BEING);
+            event.setString("message", chatMsg);
+            event.setString("text", reducedMessage);
+            event.setString("nick", sender_name);
+            event.setInt("beingId", beingId);
+            event.setInt("permissions", perms);
+            event.trigger(CHANNEL_CHAT);
+
             break;
         }
 
@@ -164,22 +194,32 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
                 break;
 
             chatMsg = msg.readString(chatMsgLength);
-            std::string::size_type pos = chatMsg.find(" : ", 0);
 
             if (msg.getId() == SMSG_PLAYER_CHAT)
             {
-                localChatTab->chatLog(chatMsg, BY_PLAYER);
+                std::string::size_type pos = chatMsg.find(" : ", 0);
+                std::string mes = chatMsg;
 
                 if (pos != std::string::npos)
                     chatMsg.erase(0, pos + 3);
 
                 trim(chatMsg);
 
-                player_node->setSpeech(chatMsg, SPEECH_TIME);
+                Mana::Event event(EVENT_PLAYER);
+                event.setString("message", mes);
+                event.setString("text", chatMsg);
+                event.setString("nick", player_node->getName());
+                event.setInt("beingId", player_node->getId());
+                event.setInt("permissions", player_relations.getDefault()
+                             & (PlayerRelation::SPEECH_LOG
+                                | PlayerRelation::SPEECH_FLOAT));
+                event.trigger(CHANNEL_CHAT);
             }
             else
             {
-                localChatTab->chatLog(chatMsg, BY_GM);
+                Mana::Event event(EVENT_ANNOUNCEMENT);
+                event.setString("message", chatMsg);
+                event.trigger(CHANNEL_CHAT);
             }
             break;
         }
@@ -187,7 +227,7 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
         case SMSG_MVP:
             // Display MVP player
             msg.readInt32(); // id
-            localChatTab->chatLog(_("MVP player."), BY_SERVER);
+            SERVER_NOTICE(_("MVP player."))
             break;
     }
 }
@@ -216,47 +256,49 @@ void ChatHandler::privateMessage(const std::string &recipient,
     outMsg.writeInt16(text.length() + 28);
     outMsg.writeString(recipient, 24);
     outMsg.writeString(text, text.length());
+
+    mSentWhispers.push(recipient);
 }
 
 void ChatHandler::channelList()
 {
-    localChatTab->chatLog(_("Channels are not supported!"), BY_SERVER);
+    SERVER_NOTICE(_("Channels are not supported!"))
 }
 
 void ChatHandler::enterChannel(const std::string &channel,
                                const std::string &password)
 {
-    localChatTab->chatLog(_("Channels are not supported!"), BY_SERVER);
+    SERVER_NOTICE(_("Channels are not supported!"))
 }
 
 void ChatHandler::quitChannel(int channelId)
 {
-    localChatTab->chatLog(_("Channels are not supported!"), BY_SERVER);
+    SERVER_NOTICE(_("Channels are not supported!"))
 }
 
 void ChatHandler::sendToChannel(int channelId, const std::string &text)
 {
-    localChatTab->chatLog(_("Channels are not supported!"), BY_SERVER);
+    SERVER_NOTICE(_("Channels are not supported!"))
 }
 
 void ChatHandler::userList(const std::string &channel)
 {
-    localChatTab->chatLog(_("Channels are not supported!"), BY_SERVER);
+    SERVER_NOTICE(_("Channels are not supported!"))
 }
 
 void ChatHandler::setChannelTopic(int channelId, const std::string &text)
 {
-    localChatTab->chatLog(_("Channels are not supported!"), BY_SERVER);
+    SERVER_NOTICE(_("Channels are not supported!"))
 }
 
 void ChatHandler::setUserMode(int channelId, const std::string &name, int mode)
 {
-    localChatTab->chatLog(_("Channels are not supported!"), BY_SERVER);
+    SERVER_NOTICE(_("Channels are not supported!"))
 }
 
 void ChatHandler::kickUser(int channelId, const std::string &name)
 {
-    localChatTab->chatLog(_("Channels are not supported!"), BY_SERVER);
+    SERVER_NOTICE(_("Channels are not supported!"))
 }
 
 void ChatHandler::who()
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 3e035f7e..6426a71e 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -27,6 +27,8 @@
 
 #include "net/tmwa/messagehandler.h"
 
+#include <queue>
+
 namespace TmwAthena {
 
 class ChatHandler : public MessageHandler, public Net::ChatHandler
@@ -61,6 +63,10 @@ class ChatHandler : public MessageHandler, public Net::ChatHandler
         void kickUser(int channelId, const std::string &name);
 
         void who();
+
+    private:
+        typedef std::queue<std::string> WhisperQueue;
+        WhisperQueue mSentWhispers;
 };
 
 } // namespace TmwAthena
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index 435d5d30..63f5fcec 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -22,12 +22,11 @@
 #include "net/tmwa/gamehandler.h"
 
 #include "client.h"
+#include "event.h"
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "gui/okdialog.h"
 
 #include "net/messagein.h"
@@ -58,6 +57,8 @@ GameHandler::GameHandler()
     };
     handledMessages = _messages;
     gameHandler = this;
+
+    listen(CHANNEL_GAME);
 }
 
 void GameHandler::handleMessage(Net::MessageIn &msg)
@@ -84,8 +85,7 @@ void GameHandler::handleMessage(Net::MessageIn &msg)
             break;
 
         case SMSG_WHO_ANSWER:
-            localChatTab->chatLog(strprintf(_("Online users: %d"),
-                                            msg.readInt32()), BY_SERVER);
+            SERVER_NOTICE(strprintf(_("Online users: %d"), msg.readInt32()))
             break;
 
         case SMSG_CHAR_SWITCH_RESPONSE:
@@ -105,6 +105,21 @@ void GameHandler::handleMessage(Net::MessageIn &msg)
     }
 }
 
+void GameHandler::event(Channels channel, const Mana::Event &event)
+{
+    if (channel == CHANNEL_GAME)
+    {
+        if (event.getName() == EVENT_ENGINESINITALIZED)
+        {
+            Game::instance()->changeMap(mMap);
+        }
+        else if (event.getName() == EVENT_MAPLOADED)
+        {
+            MessageOut outMsg(CMSG_MAP_LOADED);
+        }
+    }
+}
+
 void GameHandler::connect()
 {
     mNetwork->connect(mapServer);
@@ -142,16 +157,6 @@ void GameHandler::disconnect()
     mNetwork->disconnect();
 }
 
-void GameHandler::inGame()
-{
-    Game::instance()->changeMap(mMap);
-}
-
-void GameHandler::mapLoaded(const std::string &mapName)
-{
-    MessageOut outMsg(CMSG_MAP_LOADED);
-}
-
 void GameHandler::who()
 {
 }
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index ca8d27e6..18317445 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -22,6 +22,8 @@
 #ifndef NET_TA_MAPHANDLER_H
 #define NET_TA_MAPHANDLER_H
 
+#include "listener.h"
+
 #include "net/gamehandler.h"
 #include "net/net.h"
 #include "net/serverinfo.h"
@@ -31,23 +33,22 @@
 
 namespace TmwAthena {
 
-class GameHandler : public MessageHandler, public Net::GameHandler
+class GameHandler : public MessageHandler, public Net::GameHandler,
+        public Mana::Listener
 {
     public:
         GameHandler();
 
         void handleMessage(Net::MessageIn &msg);
 
+        void event(Channels channel, const Mana::Event &event);
+
         void connect();
 
         bool isConnected();
 
         void disconnect();
 
-        void inGame();
-
-        void mapLoaded(const std::string &mapName);
-
         void who();
 
         void quit();
@@ -60,6 +61,9 @@ class GameHandler : public MessageHandler, public Net::GameHandler
 
         void setMap(const std::string map);
 
+        /** The tmwAthena protocol is making use of the MP status bar. */
+        bool canUseMagicBar() const { return true; }
+
     private:
         std::string mMap;
         int mCharID; /// < Saved for map-server switching
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 14f48055..1935ad72 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -32,6 +32,10 @@
 #include "gui/socialwindow.h"
 #include "gui/statuswindow.h"
 
+#include "net/messagein.h"
+#include "net/messageout.h"
+#include "net/serverinfo.h"
+
 #include "net/tmwa/adminhandler.h"
 #include "net/tmwa/beinghandler.h"
 #include "net/tmwa/buysellhandler.h"
@@ -53,9 +57,6 @@
 #include "net/tmwa/gui/guildtab.h"
 #include "net/tmwa/gui/partytab.h"
 
-#include "net/messagein.h"
-#include "net/messageout.h"
-
 #include "resources/itemdb.h"
 
 #include "utils/gettext.h"
@@ -75,7 +76,7 @@ extern Party *taParty;
 
 GeneralHandler::GeneralHandler():
     mAdminHandler(new AdminHandler),
-    mBeingHandler(new BeingHandler(config.getValue("EnableSync", 0) == 1)),
+    mBeingHandler(new BeingHandler(config.getBoolValue("EnableSync"))),
     mBuySellHandler(new BuySellHandler),
     mCharHandler(new CharServerHandler),
     mChatHandler(new ChatHandler),
@@ -97,15 +98,17 @@ GeneralHandler::GeneralHandler():
     handledMessages = _messages;
     generalHandler = this;
 
-    std::list<ItemDB::Stat> stats;
-    stats.push_back(ItemDB::Stat("str", _("Strength %+d")));
-    stats.push_back(ItemDB::Stat("agi", _("Agility %+d")));
-    stats.push_back(ItemDB::Stat("vit", _("Vitality %+d")));
-    stats.push_back(ItemDB::Stat("int", _("Intelligence %+d")));
-    stats.push_back(ItemDB::Stat("dex", _("Dexterity %+d")));
-    stats.push_back(ItemDB::Stat("luck", _("Luck %+d")));
+    std::list<ItemStat> stats;
+    stats.push_back(ItemStat("str", _("Strength %+d")));
+    stats.push_back(ItemStat("agi", _("Agility %+d")));
+    stats.push_back(ItemStat("vit", _("Vitality %+d")));
+    stats.push_back(ItemStat("int", _("Intelligence %+d")));
+    stats.push_back(ItemStat("dex", _("Dexterity %+d")));
+    stats.push_back(ItemStat("luck", _("Luck %+d")));
+
+    setStatsList(stats);
 
-    ItemDB::setStatsList(stats);
+    listen(CHANNEL_GAME);
 }
 
 GeneralHandler::~GeneralHandler()
@@ -209,47 +212,48 @@ void GeneralHandler::flushNetwork()
     }
 }
 
-void GeneralHandler::guiWindowsLoaded()
-{
-    inventoryWindow->setSplitAllowed(false);
-    skillDialog->loadSkills("ea-skills.xml");
-
-    statusWindow->addAttribute(STR, _("Strength"), true, "");
-    statusWindow->addAttribute(AGI, _("Agility"), true, "");
-    statusWindow->addAttribute(VIT, _("Vitality"), true, "");
-    statusWindow->addAttribute(INT, _("Intelligence"), true, "");
-    statusWindow->addAttribute(DEX, _("Dexterity"), true, "");
-    statusWindow->addAttribute(LUK, _("Luck"), true, "");
-
-    statusWindow->addAttribute(ATK, _("Attack"), false, "");
-    statusWindow->addAttribute(DEF, _("Defense"), false, "");
-    statusWindow->addAttribute(MATK, _("M.Attack"), false, "");
-    statusWindow->addAttribute(MDEF, _("M.Defense"), false, "");
-    statusWindow->addAttribute(HIT, _("% Accuracy"), false, "");
-    statusWindow->addAttribute(FLEE, _("% Evade"), false, "");
-    statusWindow->addAttribute(CRIT, _("% Critical"), false, "");
-}
-
-void GeneralHandler::guiWindowsUnloaded()
-{
-    socialWindow->removeTab(taGuild);
-    socialWindow->removeTab(taParty);
-
-    delete guildTab;
-    guildTab = 0;
-
-    delete partyTab;
-    partyTab = 0;
-}
-
 void GeneralHandler::clearHandlers()
 {
     mNetwork->clearHandlers();
 }
 
-void GeneralHandler::stateChanged(State oldState, State newState)
+void GeneralHandler::event(Channels channel,
+                           const Mana::Event &event)
 {
-    //
+    if (channel == CHANNEL_GAME)
+    {
+        if (event.getName() == EVENT_GUIWINDOWSLOADED)
+        {
+            inventoryWindow->setSplitAllowed(false);
+            skillDialog->loadSkills("ea-skills.xml");
+
+            statusWindow->addAttribute(STR, _("Strength"), true, "");
+            statusWindow->addAttribute(AGI, _("Agility"), true, "");
+            statusWindow->addAttribute(VIT, _("Vitality"), true, "");
+            statusWindow->addAttribute(INT, _("Intelligence"), true, "");
+            statusWindow->addAttribute(DEX, _("Dexterity"), true, "");
+            statusWindow->addAttribute(LUK, _("Luck"), true, "");
+
+            statusWindow->addAttribute(ATK, _("Attack"), false, "");
+            statusWindow->addAttribute(DEF, _("Defense"), false, "");
+            statusWindow->addAttribute(MATK, _("M.Attack"), false, "");
+            statusWindow->addAttribute(MDEF, _("M.Defense"), false, "");
+            statusWindow->addAttribute(HIT, _("% Accuracy"), false, "");
+            statusWindow->addAttribute(FLEE, _("% Evade"), false, "");
+            statusWindow->addAttribute(CRIT, _("% Critical"), false, "");
+        }
+        else if (event.getName() == EVENT_GUIWINDOWSUNLOADING)
+        {
+            socialWindow->removeTab(taGuild);
+            socialWindow->removeTab(taParty);
+
+            delete guildTab;
+            guildTab = 0;
+
+            delete partyTab;
+            partyTab = 0;
+        }
+    }
 }
 
 } // namespace TmwAthena
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index d680f215..722c3215 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -22,15 +22,17 @@
 #ifndef NET_TMWA_GENERALHANDLER_H
 #define NET_TMWA_GENERALHANDLER_H
 
+#include "listener.h"
+
 #include "net/generalhandler.h"
 #include "net/net.h"
-#include "net/serverinfo.h"
 
 #include "net/tmwa/messagehandler.h"
 
 namespace TmwAthena {
 
-class GeneralHandler : public MessageHandler, public Net::GeneralHandler
+class GeneralHandler : public MessageHandler, public Net::GeneralHandler,
+        public Mana::Listener
 {
     public:
         GeneralHandler();
@@ -47,13 +49,9 @@ class GeneralHandler : public MessageHandler, public Net::GeneralHandler
 
         void flushNetwork();
 
-        void guiWindowsLoaded();
-
-        void guiWindowsUnloaded();
-
         void clearHandlers();
 
-        void stateChanged(State oldState, State newState);
+        void event(Channels channel, const Mana::Event &event);
 
     protected:
         MessageHandlerPtr mAdminHandler;
diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp
index 794ad5cc..ca922e55 100644
--- a/src/net/tmwa/gui/guildtab.cpp
+++ b/src/net/tmwa/gui/guildtab.cpp
@@ -21,17 +21,17 @@
 
 #include "net/tmwa/gui/guildtab.h"
 
+#include "chatlog.h"
 #include "commandhandler.h"
 #include "guild.h"
 #include "localplayer.h"
 
-#include "gui/theme.h"
-
 #include "net/net.h"
 #include "net/guildhandler.h"
 
 #include "resources/iteminfo.h"
 #include "resources/itemdb.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
@@ -114,4 +114,10 @@ void GuildTab::getAutoCompleteList(std::vector<std::string> &names) const
         taGuild->getNames(names);
 }
 
+void GuildTab::saveToLogFile(std::string &msg)
+{
+    if (chatLogger)
+        chatLogger->log("#Guild", msg);
+}
+
 } // namespace TmwAthena
diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h
index 031c81bf..12e15e16 100644
--- a/src/net/tmwa/gui/guildtab.h
+++ b/src/net/tmwa/gui/guildtab.h
@@ -39,6 +39,8 @@ class GuildTab : public ChatTab
 
         bool handleCommand(const std::string &type, const std::string &args);
 
+        void saveToLogFile(std::string &msg);
+
     protected:
         void handleInput(const std::string &msg);
 
diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp
index b541c498..6833831c 100644
--- a/src/net/tmwa/gui/partytab.cpp
+++ b/src/net/tmwa/gui/partytab.cpp
@@ -21,17 +21,17 @@
 
 #include "net/tmwa/gui/partytab.h"
 
+#include "chatlog.h"
 #include "commandhandler.h"
 #include "localplayer.h"
 #include "party.h"
 
-#include "gui/theme.h"
-
 #include "net/net.h"
 #include "net/partyhandler.h"
 
 #include "resources/iteminfo.h"
 #include "resources/itemdb.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
@@ -206,4 +206,10 @@ void PartyTab::getAutoCompleteList(std::vector<std::string> &names) const
         p->getNames(names);
 }
 
+void PartyTab::saveToLogFile(std::string &msg)
+{
+    if (chatLogger)
+        chatLogger->log("#Party", msg);
+}
+
 } // namespace TmwAthena
diff --git a/src/net/tmwa/gui/partytab.h b/src/net/tmwa/gui/partytab.h
index 62027726..4c16ab46 100644
--- a/src/net/tmwa/gui/partytab.h
+++ b/src/net/tmwa/gui/partytab.h
@@ -39,6 +39,8 @@ class PartyTab : public ChatTab
 
         bool handleCommand(const std::string &type, const std::string &args);
 
+        void saveToLogFile(std::string &msg);
+
     protected:
         void handleInput(const std::string &msg);
 
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 93bc7807..1ff2f22a 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -21,6 +21,7 @@
 #include "net/tmwa/guildhandler.h"
 
 #include "guild.h"
+#include "event.h"
 #include "localplayer.h"
 #include "log.h"
 
@@ -389,8 +390,7 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
 
 void GuildHandler::create(const std::string &name)
 {
-    localChatTab->chatLog(_("Guild creation isn't supported yet."),
-                          BY_SERVER);
+    SERVER_NOTICE(_("Guild creation isn't supported yet."))
     return;
 
     MessageOut msg(CMSG_GUILD_CREATE);
@@ -403,10 +403,10 @@ void GuildHandler::invite(int guildId, const std::string &name)
     // TODO?
 }
 
-void GuildHandler::invite(int guildId, Player *player)
+void GuildHandler::invite(int guildId, Being *being)
 {
     MessageOut msg(CMSG_GUILD_INVITE);
-    msg.writeInt32(player->getId());
+    msg.writeInt32(being->getId());
     msg.writeInt32(0); // Unused
     msg.writeInt32(0); // Unused
 }
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 39dbe486..8bde222f 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -40,7 +40,7 @@ class GuildHandler : public Net::GuildHandler, public MessageHandler
 
         void invite(int guildId, const std::string &name);
 
-        void invite(int guildId, Player *player);
+        void invite(int guildId, Being *being);
 
         void inviteResponse(int guildId, bool response);
 
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 5e404e6c..1d99eca4 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -23,6 +23,7 @@
 
 #include "configuration.h"
 #include "equipment.h"
+#include "event.h"
 #include "inventory.h"
 #include "item.h"
 #include "itemshortcut.h"
@@ -45,30 +46,30 @@
 
 extern Net::InventoryHandler *inventoryHandler;
 
-const Equipment::Slot EQUIP_POINTS[Equipment::EQUIP_VECTOREND] = {
-    Equipment::EQUIP_LEGS_SLOT,
-    Equipment::EQUIP_FIGHT1_SLOT,
-    Equipment::EQUIP_GLOVES_SLOT,
-    Equipment::EQUIP_RING2_SLOT,
-    Equipment::EQUIP_RING1_SLOT,
-    Equipment::EQUIP_FIGHT2_SLOT,
-    Equipment::EQUIP_FEET_SLOT,
-    Equipment::EQUIP_NECK_SLOT,
-    Equipment::EQUIP_HEAD_SLOT,
-    Equipment::EQUIP_TORSO_SLOT,
-    Equipment::EQUIP_PROJECTILE_SLOT};
-
 namespace TmwAthena {
 
+const EquipmentSlot EQUIP_POINTS[EQUIP_VECTOR_END] = {
+    EQUIP_LEGS_SLOT,
+    EQUIP_FIGHT1_SLOT,
+    EQUIP_ARMS_SLOT,
+    EQUIP_RING2_SLOT,
+    EQUIP_RING1_SLOT,
+    EQUIP_FIGHT2_SLOT,
+    EQUIP_FEET_SLOT,
+    EQUIP_NECKLACE_SLOT,
+    EQUIP_HEAD_SLOT,
+    EQUIP_TORSO_SLOT,
+    EQUIP_PROJECTILE_SLOT};
+
 int getSlot(int eAthenaSlot)
 {
     if (eAthenaSlot == 0)
     {
-        return Equipment::EQUIP_VECTOREND;
+        return EQUIP_VECTOR_END;
     }
 
     if (eAthenaSlot & 0x8000)
-        return Equipment::EQUIP_PROJECTILE_SLOT;
+        return EQUIP_PROJECTILE_SLOT;
 
     int mask = 1;
     int position = 0;
@@ -108,6 +109,8 @@ InventoryHandler::InventoryHandler()
 
     mStorage = 0;
     mStorageWindow = 0;
+
+    listen(CHANNEL_ITEM);
 }
 
 InventoryHandler::~InventoryHandler()
@@ -126,8 +129,8 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
     int number, flag;
     int index, amount, itemId, equipType, arrow;
     int identified, cards[4], itemType;
-    Inventory *inventory = player_node->getInventory();
-    player_node->mEquipment->setBackend(&mEquips);
+    Inventory *inventory = PlayerInfo::getInventory();
+    PlayerInfo::getEquipment()->setBackend(&mEquips);
 
     switch (msg.getId())
     {
@@ -170,17 +173,10 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
                 }
 
                 if (msg.getId() == SMSG_PLAYER_INVENTORY)
-                {
-                    // Trick because arrows are not considered equipment
-                    bool isEquipment = arrow & 0x8000;
-
-                    inventory->setItem(index, itemId, amount, isEquipment);
-                }
+                    inventory->setItem(index, itemId, amount);
                 else
-                {
                     mInventoryItems.push_back(InventoryItem(index, itemId,
                                                             amount, false));
-                }
             }
             break;
 
@@ -224,11 +220,11 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
             msg.readInt8();  // refine
             for (int i = 0; i < 4; i++)
                 cards[i] = msg.readInt16();
-            equipType = msg.readInt16();
+            msg.readInt16(); // EquipType
             itemType = msg.readInt8();
 
             {
-                const ItemInfo &itemInfo = ItemDB::get(itemId);
+                const ItemInfo &itemInfo = itemDb->get(itemId);
 
                 unsigned char err = msg.readInt8();
                 if (err)
@@ -244,7 +240,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
                     if  (item && item->getId() == itemId)
                         amount += inventory->getItem(index)->getQuantity();
 
-                    inventory->setItem(index, itemId, amount, equipType != 0);
+                    inventory->setItem(index, itemId, amount);
                 }
 
                 inventoryWindow->updateButtons();
@@ -287,7 +283,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
 
             if (msg.readInt8() == 0)
             {
-                localChatTab->chatLog(_("Failed to use item."), BY_SERVER);
+                SERVER_NOTICE(_("Failed to use item."))
             }
             else
             {
@@ -319,8 +315,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
                 InventoryItems::iterator it = mInventoryItems.begin();
                 InventoryItems::iterator it_end = mInventoryItems.end();
                 for (; it != it_end; it++)
-                    mStorage->setItem((*it).slot, (*it).id, (*it).quantity,
-                                      (*it).equip);
+                    mStorage->setItem((*it).slot, (*it).id, (*it).quantity);
                 mInventoryItems.clear();
 
                 if (!mStorageWindow)
@@ -345,9 +340,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
                 item->increaseQuantity(amount);
             }
             else
-            {
-                mStorage->setItem(index, itemId, amount, false);
-            }
+                mStorage->setItem(index, itemId, amount);
             break;
 
         case SMSG_PLAYER_STORAGE_REMOVE:
@@ -389,7 +382,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
                 msg.readInt8();  // refine
                 msg.skip(8);     // card
 
-                inventory->setItem(index, itemId, 1, true);
+                inventory->setItem(index, itemId, 1);
 
                 if (equipType)
                 {
@@ -404,7 +397,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
             flag = msg.readInt8();
 
             if (!flag)
-                localChatTab->chatLog(_("Unable to equip."), BY_SERVER);
+                SERVER_NOTICE(_("Unable to equip."))
             else
                 mEquips.setEquipment(getSlot(equipType), index);
             break;
@@ -415,7 +408,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
             flag = msg.readInt8();
 
             if (!flag)
-                localChatTab->chatLog(_("Unable to unequip."), BY_SERVER);
+                SERVER_NOTICE(_("Unable to unequip."))
             else
                 mEquips.setEquipment(getSlot(equipType), -1);
             break;
@@ -433,46 +426,90 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
             index -= INVENTORY_OFFSET;
 
             logger->log("Arrows equipped: %i", index);
-            mEquips.setEquipment(Equipment::EQUIP_PROJECTILE_SLOT, index);
+            mEquips.setEquipment(EQUIP_PROJECTILE_SLOT, index);
             break;
     }
 }
 
-void InventoryHandler::equipItem(const Item *item)
+void InventoryHandler::event(Channels channel,
+                             const Mana::Event &event)
 {
-    if (!item)
-        return;
+    if (channel == CHANNEL_ITEM)
+    {
+        if (event.getName() == EVENT_DOCLOSEINVENTORY)
+        {
+            // No need to worry about type
+            MessageOut outMsg(CMSG_CLOSE_STORAGE);
+        }
+        else
+        {
+            Item *item = event.getItem("item");
 
-    MessageOut outMsg(CMSG_PLAYER_EQUIP);
-    outMsg.writeInt16(item->getInvIndex() + INVENTORY_OFFSET);
-    outMsg.writeInt16(0);
-}
+            if (!item)
+                return;
 
-void InventoryHandler::unequipItem(const Item *item)
-{
-    if (!item)
-        return;
+            int index = item->getInvIndex() + INVENTORY_OFFSET;
 
-    MessageOut outMsg(CMSG_PLAYER_UNEQUIP);
-    outMsg.writeInt16(item->getInvIndex() + INVENTORY_OFFSET);
-}
-
-void InventoryHandler::useItem(const Item *item)
-{
-    if (!item)
-        return;
+            if (event.getName() == EVENT_DOEQUIP)
+            {
+                MessageOut outMsg(CMSG_PLAYER_EQUIP);
+                outMsg.writeInt16(index);
+                outMsg.writeInt16(0);
+            }
+            else if (event.getName() == EVENT_DOUNEQUIP)
+            {
+                MessageOut outMsg(CMSG_PLAYER_UNEQUIP);
+                outMsg.writeInt16(index);
+            }
+            else if (event.getName() == EVENT_DOUSE)
+            {
+                MessageOut outMsg(CMSG_PLAYER_INVENTORY_USE);
+                outMsg.writeInt16(index);
+                outMsg.writeInt32(item->getId()); // unused
+            }
+            else if (event.getName() == EVENT_DODROP)
+            {
+                int amount = event.getInt("amount", 1);
 
-    MessageOut outMsg(CMSG_PLAYER_INVENTORY_USE);
-    outMsg.writeInt16(item->getInvIndex() + INVENTORY_OFFSET);
-    outMsg.writeInt32(item->getId()); // unused
-}
+                // TODO: Fix wrong coordinates of drops, serverside?
+                // (what's wrong here?)
+                MessageOut outMsg(CMSG_PLAYER_INVENTORY_DROP);
+                outMsg.writeInt16(index);
+                outMsg.writeInt16(amount);
+            }
+            else if (event.getName() == EVENT_DOMOVE)
+            {
+                int newIndex = event.getInt("newIndex", -1);
 
-void InventoryHandler::dropItem(const Item *item, int amount)
-{
-    // TODO: Fix wrong coordinates of drops, serverside? (what's wrong here?)
-    MessageOut outMsg(CMSG_PLAYER_INVENTORY_DROP);
-    outMsg.writeInt16(item->getInvIndex() + INVENTORY_OFFSET);
-    outMsg.writeInt16(amount);
+                if (newIndex >= 0)
+                {
+                    // Not implemented for tmwAthena (possible?)
+                }
+                else
+                {
+                    int source = event.getInt("source");
+                    int destination = event.getInt("destination");
+                    int amount = event.getInt("amount", 1);
+
+                    if (source == Inventory::INVENTORY
+                            && destination == Inventory::STORAGE)
+                    {
+                        MessageOut outMsg(CMSG_MOVE_TO_STORAGE);
+                        outMsg.writeInt16(index);
+                        outMsg.writeInt32(amount);
+                    }
+                    else if (source == Inventory::STORAGE
+                             && destination == Inventory::INVENTORY)
+                    {
+                        MessageOut outMsg(CSMG_MOVE_FROM_STORAGE);
+                        outMsg.writeInt16(index - INVENTORY_OFFSET
+                                          + STORAGE_OFFSET);
+                        outMsg.writeInt32(amount);
+                    }
+                }
+            }
+        }
+    }
 }
 
 bool InventoryHandler::canSplit(const Item *item)
@@ -480,43 +517,6 @@ bool InventoryHandler::canSplit(const Item *item)
     return false;
 }
 
-void InventoryHandler::splitItem(const Item *item, int amount)
-{
-    // Not implemented for eAthena (possible?)
-}
-
-void InventoryHandler::moveItem(int oldIndex, int newIndex)
-{
-    // Not implemented for eAthena (possible?)
-}
-
-void InventoryHandler::openStorage(int type)
-{
-    // Doesn't apply to eAthena, since opening happens through NPCs?
-}
-
-void InventoryHandler::closeStorage(int type)
-{
-    MessageOut outMsg(CMSG_CLOSE_STORAGE);
-}
-
-void InventoryHandler::moveItem(int source, int slot, int amount,
-                                int destination)
-{
-    if (source == Inventory::INVENTORY && destination == Inventory::STORAGE)
-    {
-        MessageOut outMsg(CMSG_MOVE_TO_STORAGE);
-        outMsg.writeInt16(slot + INVENTORY_OFFSET);
-        outMsg.writeInt32(amount);
-    }
-    else if (source == Inventory::STORAGE && destination == Inventory::INVENTORY)
-    {
-        MessageOut outMsg(CSMG_MOVE_FROM_STORAGE);
-        outMsg.writeInt16(slot + STORAGE_OFFSET);
-        outMsg.writeInt32(amount);
-    }
-}
-
 size_t InventoryHandler::getSize(int type) const
 {
     switch (type)
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 0c4ad092..dfbefaa8 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -24,7 +24,8 @@
 
 #include "equipment.h"
 #include "inventory.h"
-#include "localplayer.h"
+#include "listener.h"
+#include "playerinfo.h"
 
 #include "gui/inventorywindow.h"
 
@@ -51,7 +52,7 @@ class EquipBackend : public Equipment::Backend {
             {
                 return NULL;
             }
-            return player_node->getInventory()->getItem(invyIndex);
+            return PlayerInfo::getInventory()->getItem(invyIndex);
         }
 
         void clear()
@@ -60,7 +61,7 @@ class EquipBackend : public Equipment::Backend {
             {
                 if (mEquipment[i] != -1)
                 {
-                    Item* item = player_node->getInventory()->getItem(i);
+                    Item* item = PlayerInfo::getInventory()->getItem(i);
                     if (item)
                     {
                         item->setEquipped(false);
@@ -74,7 +75,7 @@ class EquipBackend : public Equipment::Backend {
         void setEquipment(int index, int inventoryIndex)
         {
             // Unequip existing item
-            Item* item = player_node->getInventory()->getItem(mEquipment[index]);
+            Item* item = PlayerInfo::getInventory()->getItem(mEquipment[index]);
             if (item)
             {
                 item->setEquipped(false);
@@ -82,7 +83,7 @@ class EquipBackend : public Equipment::Backend {
 
             mEquipment[index] = inventoryIndex;
 
-            item = player_node->getInventory()->getItem(inventoryIndex);
+            item = PlayerInfo::getInventory()->getItem(inventoryIndex);
             if (item)
             {
                 item->setEquipped(true);
@@ -117,7 +118,8 @@ class InventoryItem
 
 typedef std::list<InventoryItem> InventoryItems;
 
-class InventoryHandler : public MessageHandler, public Net::InventoryHandler
+class InventoryHandler : public MessageHandler, public Net::InventoryHandler,
+        public Mana::Listener
 {
     public:
         enum {
@@ -131,27 +133,10 @@ class InventoryHandler : public MessageHandler, public Net::InventoryHandler
 
         void handleMessage(Net::MessageIn &msg);
 
-        void equipItem(const Item *item);
-
-        void unequipItem(const Item *item);
-
-        void useItem(const Item *item);
-
-        void dropItem(const Item *item, int amount);
+        void event(Channels channel, const Mana::Event &event);
 
         bool canSplit(const Item *item);
 
-        void splitItem(const Item *item, int amount);
-
-        void moveItem(int oldIndex, int newIndex);
-
-        void openStorage(int type);
-
-        void closeStorage(int type);
-
-        void moveItem(int source, int slot, int amount,
-                      int destination);
-
         size_t getSize(int type) const;
 
     private:
diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp
index abc8103b..a8e98860 100644
--- a/src/net/tmwa/itemhandler.cpp
+++ b/src/net/tmwa/itemhandler.cpp
@@ -21,7 +21,7 @@
 
 #include "net/tmwa/itemhandler.h"
 
-#include "flooritemmanager.h"
+#include "actorspritemanager.h"
 
 #include "net/messagein.h"
 
@@ -54,13 +54,13 @@ void ItemHandler::handleMessage(Net::MessageIn &msg)
                 int y = msg.readInt16();
                 msg.skip(4);     // amount,subX,subY / subX,subY,amount
 
-                floorItemManager->create(id, itemId, x, y);
+                actorSpriteManager->createItem(id, itemId, x, y);
             }
             break;
 
         case SMSG_ITEM_REMOVE:
-            if (FloorItem *item = floorItemManager->findById(msg.readInt32()))
-                floorItemManager->destroy(item);
+            if (FloorItem *item = actorSpriteManager->findItem(msg.readInt32()))
+                actorSpriteManager->destroy(item);
             break;
     }
 }
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index e58acb4d..00b7b145 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -235,6 +235,12 @@ void LoginHandler::getRegistrationDetails()
 
 void LoginHandler::loginAccount(LoginData *loginData)
 {
+    // Since we're attempting to use the tAthena protocol,
+    // let's reset the character slots to the good value,
+    // in case we just logged out a Manaserv server
+    // with a different config.
+    loginData->resetCharacterSlots();
+
     sendLoginRegister(loginData->username, loginData->password);
 }
 
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 5888c679..337226a9 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -21,11 +21,9 @@
 
 #include "net/tmwa/npchandler.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
+#include "event.h"
 #include "localplayer.h"
-#include "npc.h"
-
-#include "gui/npcdialog.h"
 
 #include "net/messagein.h"
 #include "net/messageout.h"
@@ -34,10 +32,27 @@
 
 #include "net/tmwa/protocol.h"
 
+#include "utils/stringutils.h"
+
 #include <SDL_types.h>
 
 extern Net::NpcHandler *npcHandler;
 
+static void parseMenu(Mana::Event *event, const std::string &options)
+{
+    std::istringstream iss(options);
+
+    int count = 0;
+    std::string tmp;
+    while (getline(iss, tmp, ':'))
+    {
+        count++;
+        event->setString("choice" + toString(count), tmp);
+    }
+
+    event->setInt("choiceCount", count);
+}
+
 namespace TmwAthena {
 
 NpcHandler::NpcHandler()
@@ -63,82 +78,118 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
     }
 
     int npcId = msg.readInt32();
-    NpcDialogs::iterator diag = mNpcDialogs.find(npcId);
-    NpcDialog *dialog = 0;
-
-    if (diag == mNpcDialogs.end())
-    {
-        // Empty dialogs don't help
-        if (msg.getId() == SMSG_NPC_CLOSE)
-        {
-            closeDialog(npcId);
-            return;
-        }
-        else if (msg.getId() == SMSG_NPC_NEXT)
-        {
-            nextDialog(npcId);
-            return;
-        }
-        else
-        {
-            dialog = new NpcDialog(npcId);
-            Wrapper wrap;
-            wrap.dialog = dialog;
-            mNpcDialogs[npcId] = wrap;
-        }
-    }
-    else
-    {
-        dialog = diag->second.dialog;
-    }
+    Mana::Event *event = 0;
 
     switch (msg.getId())
     {
-        case SMSG_NPC_CHOICE:
-            dialog->choiceRequest();
-            dialog->parseListItems(msg.readString(msg.getLength() - 8));
-            break;
-
-        case SMSG_NPC_MESSAGE:
-            dialog->addText(msg.readString(msg.getLength() - 8));
-            break;
-
-         case SMSG_NPC_CLOSE:
-            // Show the close button
-            dialog->showCloseButton();
-            break;
-
-        case SMSG_NPC_NEXT:
-            // Show the next button
-            dialog->showNextButton();
-            break;
-
-        case SMSG_NPC_INT_INPUT:
-            // Request for an integer
-            dialog->integerRequest(0);
-            break;
-
-        case SMSG_NPC_STR_INPUT:
-            // Request for a string
-            dialog->textRequest("");
-            break;
+    case SMSG_NPC_CHOICE:
+        event = new Mana::Event(EVENT_MENU);
+        event->setInt("id", npcId);
+        parseMenu(event, msg.readString(msg.getLength() - 8));
+        event->trigger(CHANNEL_NPC);
+        break;
+
+    case SMSG_NPC_MESSAGE:
+        event = new Mana::Event(EVENT_MESSAGE);
+        event->setInt("id", npcId);
+        event->setString("text", msg.readString(msg.getLength() - 8));
+        event->trigger(CHANNEL_NPC);
+        break;
+
+     case SMSG_NPC_CLOSE:
+        // Show the close button
+        event = new Mana::Event(EVENT_CLOSE);
+        event->setInt("id", npcId);
+        event->trigger(CHANNEL_NPC);
+        break;
+
+    case SMSG_NPC_NEXT:
+        // Show the next button
+        event = new Mana::Event(EVENT_NEXT);
+        event->setInt("id", npcId);
+        event->trigger(CHANNEL_NPC);
+        break;
+
+    case SMSG_NPC_INT_INPUT:
+        // Request for an integer
+        event = new Mana::Event(EVENT_INTEGERINPUT);
+        event->setInt("id", npcId);
+        event->trigger(CHANNEL_NPC);
+        break;
+
+    case SMSG_NPC_STR_INPUT:
+        // Request for a string
+        event = new Mana::Event(EVENT_STRINGINPUT);
+        event->setInt("id", npcId);
+        event->trigger(CHANNEL_NPC);
+        break;
     }
 
+    delete event;
+
     if (player_node->getCurrentAction() != Being::SIT)
         player_node->setAction(Being::STAND);
 }
 
+void NpcHandler::startShopping(int beingId)
+{
+    // TODO
+}
+
+void NpcHandler::buy(int beingId)
+{
+    MessageOut outMsg(CMSG_NPC_BUY_SELL_REQUEST);
+    outMsg.writeInt32(beingId);
+    outMsg.writeInt8(0); // Buy
+}
+
+void NpcHandler::sell(int beingId)
+{
+    MessageOut outMsg(CMSG_NPC_BUY_SELL_REQUEST);
+    outMsg.writeInt32(beingId);
+    outMsg.writeInt8(1); // Sell
+}
+
+void NpcHandler::buyItem(int beingId, int itemId, int amount)
+{
+    MessageOut outMsg(CMSG_NPC_BUY_REQUEST);
+    outMsg.writeInt16(8); // One item (length of packet)
+    outMsg.writeInt16(amount);
+    outMsg.writeInt16(itemId);
+}
+
+void NpcHandler::sellItem(int beingId, int itemId, int amount)
+{
+    MessageOut outMsg(CMSG_NPC_SELL_REQUEST);
+    outMsg.writeInt16(8); // One item (length of packet)
+    outMsg.writeInt16(itemId + INVENTORY_OFFSET);
+    outMsg.writeInt16(amount);
+}
+
+void NpcHandler::endShopping(int beingId)
+{
+    // TODO
+}
+
 void NpcHandler::talk(int npcId)
 {
     MessageOut outMsg(CMSG_NPC_TALK);
     outMsg.writeInt32(npcId);
     outMsg.writeInt8(0); // Unused
+
+    Mana::Event event(EVENT_TALKSENT);
+    event.setInt("npcId", npcId);
+    event.trigger(CHANNEL_NPC);
 }
 
 void NpcHandler::nextDialog(int npcId)
 {
     MessageOut outMsg(CMSG_NPC_NEXT_REQUEST);
     outMsg.writeInt32(npcId);
+
+    Mana::Event event(EVENT_NEXTSENT);
+    event.setInt("npcId", npcId);
+    event.trigger(CHANNEL_NPC);
 }
 
 void NpcHandler::closeDialog(int npcId)
@@ -146,19 +197,21 @@ void NpcHandler::closeDialog(int npcId)
     MessageOut outMsg(CMSG_NPC_CLOSE);
     outMsg.writeInt32(npcId);
 
-    NpcDialogs::iterator it = mNpcDialogs.find(npcId);
-    if (it != mNpcDialogs.end())
-    {
-        (*it).second.dialog->close();
-        mNpcDialogs.erase(it);
-    }
+    Mana::Event event(EVENT_CLOSESENT);
+    event.setInt("npcId", npcId);
+    event.trigger(CHANNEL_NPC);
 }
 
-void NpcHandler::listInput(int npcId, int value)
+void NpcHandler::menuSelect(int npcId, int choice)
 {
     MessageOut outMsg(CMSG_NPC_LIST_CHOICE);
     outMsg.writeInt32(npcId);
-    outMsg.writeInt8(value);
+    outMsg.writeInt8(choice);
+
+    Mana::Event event(EVENT_MENUSENT);
+    event.setInt("npcId", npcId);
+    event.setInt("choice", choice);
+    event.trigger(CHANNEL_NPC);
 }
 
 void NpcHandler::integerInput(int npcId, int value)
@@ -166,6 +219,11 @@ void NpcHandler::integerInput(int npcId, int value)
     MessageOut outMsg(CMSG_NPC_INT_RESPONSE);
     outMsg.writeInt32(npcId);
     outMsg.writeInt32(value);
+
+    Mana::Event event(EVENT_INTEGERINPUTSENT);
+    event.setInt("npcId", npcId);
+    event.setInt("value", value);
+    event.trigger(CHANNEL_NPC);
 }
 
 void NpcHandler::stringInput(int npcId, const std::string &value)
@@ -175,57 +233,17 @@ void NpcHandler::stringInput(int npcId, const std::string &value)
     outMsg.writeInt32(npcId);
     outMsg.writeString(value, value.length());
     outMsg.writeInt8(0); // Prevent problems with string reading
-}
 
-void NpcHandler::sendLetter(int npcId, const std::string &recipient,
-                            const std::string &text)
-{
-    // TODO
+    Mana::Event event(EVENT_STRINGINPUTSENT);
+    event.setInt("npcId", npcId);
+    event.setString("value", value);
+    event.trigger(CHANNEL_NPC);
 }
 
-void NpcHandler::startShopping(int beingId)
-{
-    // TODO
-}
-
-void NpcHandler::buy(int beingId)
-{
-    MessageOut outMsg(CMSG_NPC_BUY_SELL_REQUEST);
-    outMsg.writeInt32(beingId);
-    outMsg.writeInt8(0); // Buy
-}
-
-void NpcHandler::sell(int beingId)
-{
-    MessageOut outMsg(CMSG_NPC_BUY_SELL_REQUEST);
-    outMsg.writeInt32(beingId);
-    outMsg.writeInt8(1); // Sell
-}
-
-void NpcHandler::buyItem(int beingId, int itemId, int amount)
-{
-    MessageOut outMsg(CMSG_NPC_BUY_REQUEST);
-    outMsg.writeInt16(8); // One item (length of packet)
-    outMsg.writeInt16(amount);
-    outMsg.writeInt16(itemId);
-}
-
-void NpcHandler::sellItem(int beingId, int itemId, int amount)
-{
-    MessageOut outMsg(CMSG_NPC_SELL_REQUEST);
-    outMsg.writeInt16(8); // One item (length of packet)
-    outMsg.writeInt16(itemId + INVENTORY_OFFSET);
-    outMsg.writeInt16(amount);
-}
-
-void NpcHandler::endShopping(int beingId)
-{
-    // TODO
-}
-
-void NpcHandler::clearDialogs()
+void NpcHandler::sendLetter(int npcId, const std::string &recipient,
+            const std::string &text)
 {
-    mNpcDialogs.clear();
+    //NOTE: eA doesn't have letters
 }
 
 } // namespace TmwAthena
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index bd696bdd..1e933418 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -22,15 +22,14 @@
 #ifndef NET_TA_NPCHANDLER_H
 #define NET_TA_NPCHANDLER_H
 
-#include "net/net.h"
+#include "listener.h"
+
 #include "net/npchandler.h"
 
 #include "net/tmwa/messagehandler.h"
 
 #include <map>
 
-class NpcDialog;
-
 namespace TmwAthena {
 
 class NpcHandler : public MessageHandler, public Net::NpcHandler
@@ -40,13 +39,25 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
 
         void handleMessage(Net::MessageIn &msg);
 
+        void startShopping(int beingId);
+
+        void buy(int beingId);
+
+        void sell(int beingId);
+
+        void buyItem(int beingId, int itemId, int amount);
+
+        void sellItem(int beingId, int itemId, int amount);
+
+        void endShopping(int beingId);
+
         void talk(int npcId);
 
         void nextDialog(int npcId);
 
         void closeDialog(int npcId);
 
-        void listInput(int npcId, int value);
+        void menuSelect(int npcId, int choice);
 
         void integerInput(int npcId, int value);
 
@@ -55,26 +66,6 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
         void sendLetter(int npcId, const std::string &recipient,
                         const std::string &text);
 
-        void startShopping(int beingId);
-
-        void buy(int beingId);
-
-        void sell(int beingId);
-
-        void buyItem(int beingId, int itemId, int amount);
-
-        void sellItem(int beingId, int itemId, int amount);
-
-        void endShopping(int beingId);
-
-        void clearDialogs();
-
-    private:
-        typedef struct {
-            NpcDialog* dialog;
-        } Wrapper;
-        typedef std::map<int, Wrapper> NpcDialogs;
-        NpcDialogs mNpcDialogs;
 };
 
 } // namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 611fe3e6..00b1e621 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -20,7 +20,8 @@
 
 #include "net/tmwa/partyhandler.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
+#include "event.h"
 #include "localplayer.h"
 #include "log.h"
 
@@ -78,12 +79,9 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
     {
         case SMSG_PARTY_CREATE:
             if (msg.readInt8())
-                localChatTab->chatLog(_("Could not create party."), BY_SERVER);
+                SERVER_NOTICE(_("Could not create party."))
             else
-            {
-                localChatTab->chatLog(_("Party successfully created."),
-                                      BY_SERVER);
-            }
+                SERVER_NOTICE(_("Party successfully created."))
             break;
         case SMSG_PARTY_INFO:
             {
@@ -143,12 +141,9 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
                 std::string nick = "";
                 Being *being;
 
-                if ((being = beingManager->findBeing(id)))
+                if ((being = actorSpriteManager->findBeing(id)))
                 {
-                    if (being->getType() == Being::PLAYER)
-                    {
-                        nick = being->getName();
-                    }
+                    nick = being->getName();
                 }
 
                 socialWindow->showPartyInvite(partyName, nick);
@@ -238,8 +233,7 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
                 {
                     taParty->removeFromMembers();
                     taParty->clearMembers();
-                    localChatTab->chatLog(_("You have left the party."),
-                                          BY_SERVER);
+                    SERVER_NOTICE(_("You have left the party."))
                     if (partyTab)
                     {
                         delete partyTab;
@@ -252,9 +246,10 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
                     partyTab->chatLog(strprintf(_("%s has left your party."),
                                     nick.c_str()), BY_SERVER);
 
-                    Being *b = beingManager->findBeing(id);
-                    if (b && b->getType() == Being::PLAYER)
-                        static_cast<Player*>(b)->setParty(NULL);
+                    if (Being *b = actorSpriteManager->findBeing(id))
+                    {
+                        b->setParty(NULL);
+                    }
 
                     taParty->removeMember(id);
                 }
@@ -274,9 +269,9 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
 
                 // The server only sends this when the member is in range, so
                 // lets make sure they get the party hilight.
-                if (Being *b = beingManager->findBeing(id))
+                if (Being *b = actorSpriteManager->findBeing(id))
                 {
-                    static_cast<Player*>(b)->setParty(taParty);
+                    b->setParty(taParty);
                 }
             }
             break;
@@ -319,19 +314,19 @@ void PartyHandler::join(int partyId)
     // TODO?
 }
 
-void PartyHandler::invite(Player *player)
+void PartyHandler::invite(Being *being)
 {
     MessageOut outMsg(CMSG_PARTY_INVITE);
-    outMsg.writeInt32(player->getId());
+    outMsg.writeInt32(being->getId());
 }
 
 void PartyHandler::invite(const std::string &name)
 {
-    Being *invitee = beingManager->findBeingByName(name, Being::PLAYER);
+    Being *invitee = actorSpriteManager->findBeingByName(name, Being::PLAYER);
 
     if (invitee)
     {
-        invite((Player *)invitee);
+        invite(invitee);
         partyTab->chatLog(strprintf(_("Invited user %s to party."),
                                     invitee->getName().c_str()), BY_SERVER);
     }
@@ -342,8 +337,7 @@ void PartyHandler::invite(const std::string &name)
     }
     else
     {
-        localChatTab->chatLog(_("You can only inivte when you are in a party!"),
-                              BY_SERVER);
+        SERVER_NOTICE(_("You can only inivte when you are in a party!"))
     }
 }
 
@@ -359,10 +353,10 @@ void PartyHandler::leave()
     MessageOut outMsg(CMSG_PARTY_LEAVE);
 }
 
-void PartyHandler::kick(Player *player)
+void PartyHandler::kick(Being *being)
 {
     MessageOut outMsg(CMSG_PARTY_KICK);
-    outMsg.writeInt32(player->getId());
+    outMsg.writeInt32(being->getId());
     outMsg.writeString("", 24); //Unused
 }
 
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index fc8d741f..5afc8e53 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -43,7 +43,7 @@ class PartyHandler : public MessageHandler, public Net::PartyHandler
 
         void join(int partyId);
 
-        void invite(Player *player);
+        void invite(Being *being);
 
         void invite(const std::string &name);
 
@@ -51,7 +51,7 @@ class PartyHandler : public MessageHandler, public Net::PartyHandler
 
         void leave();
 
-        void kick(Player *player);
+        void kick(Being *being);
 
         void kick(const std::string &name);
 
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 48e7f4b3..725a00cc 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -21,28 +21,25 @@
 
 #include "net/tmwa/playerhandler.h"
 
+#include "event.h"
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
-#include "npc.h"
+#include "playerinfo.h"
 #include "units.h"
 
 #include "gui/buy.h"
 #include "gui/buysell.h"
 #include "gui/gui.h"
-#include "gui/npcdialog.h"
 #include "gui/okdialog.h"
 #include "gui/sell.h"
 #include "gui/statuswindow.h"
 #include "gui/viewport.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/messagein.h"
 #include "net/messageout.h"
 
 #include "net/tmwa/protocol.h"
-#include "net/tmwa/npchandler.h"
 
 #include "utils/stringutils.h"
 #include "utils/gettext.h"
@@ -54,9 +51,6 @@ extern OkDialog *deathNotice;
 // everything beyond will reset the port hard.
 static const int MAP_TELEPORT_SCROLL_DISTANCE = 8;
 
-#define ATTR_BONUS(atr) \
-(player_node->getAttributeEffective(atr) - player_node->getAttributeBase(atr))
-
 // TODO Move somewhere else
 namespace {
 
@@ -83,14 +77,11 @@ namespace {
 
             BuyDialog::closeAll();
             BuySellDialog::closeAll();
-            NpcDialog::closeAll();
             SellDialog::closeAll();
 
             viewport->closePopupMenu();
 
-            TmwAthena::NpcHandler *handler =
-                    static_cast<TmwAthena::NpcHandler*>(Net::getNpcHandler());
-            handler->clearDialogs();
+            Mana::Event::trigger(CHANNEL_NPC, EVENT_CLOSEALL);
         }
     } deathListener;
 
@@ -220,7 +211,6 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                 }
 
                 player_node->setAction(Being::STAND);
-                player_node->setFrame(0);
                 player_node->setTileCoords(x, y);
 
                 logger->log("Adjust scrolling by %d:%d", (int) scrollOffsetX,
@@ -241,17 +231,17 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                       player_node->setWalkSpeed(Vector(value, value, 0));
                     break;
                     case 0x0004: break; // manner
-                    case 0x0005: player_node->setHp(value); break;
-                    case 0x0006: player_node->setMaxHp(value); break;
-                    case 0x0007: player_node->setMP(value); break;
-                    case 0x0008: player_node->setMaxMP(value); break;
-                    case 0x0009: player_node->setCharacterPoints(value); break;
-                    case 0x000b: player_node->setLevel(value); break;
-                    case 0x000c: player_node->setSkillPoints(value); break;
+                    case 0x0005: PlayerInfo::setAttribute(HP, value); break;
+                    case 0x0006: PlayerInfo::setAttribute(MAX_HP, value); break;
+                    case 0x0007: PlayerInfo::setAttribute(MP, value); break;
+                    case 0x0008: PlayerInfo::setAttribute(MAX_MP, value); break;
+                    case 0x0009: PlayerInfo::setAttribute(CHAR_POINTS, value); break;
+                    case 0x000b: PlayerInfo::setAttribute(LEVEL, value); break;
+                    case 0x000c: PlayerInfo::setAttribute(SKILL_POINTS, value); break;
                     case 0x0018:
-                                 if (value >= player_node->getMaxWeight() / 2 &&
-                                         player_node->getTotalWeight() <
-                                         player_node->getMaxWeight() / 2)
+                                 if (value >= PlayerInfo::getAttribute(MAX_WEIGHT) / 2 &&
+                                         PlayerInfo::getAttribute(TOTAL_WEIGHT) <
+                                         PlayerInfo::getAttribute(MAX_WEIGHT) / 2)
                                  {
                                      weightNotice = new OkDialog(_("Message"),
                                              _("You are carrying more than "
@@ -260,60 +250,39 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                                      weightNotice->addActionListener(
                                              &weightListener);
                                  }
-                                 player_node->setTotalWeight(value);
+                                 PlayerInfo::setAttribute(TOTAL_WEIGHT, value);
                                  break;
-                    case 0x0019: player_node->setMaxWeight(value); break;
+                    case 0x0019: PlayerInfo::setAttribute(MAX_WEIGHT, value); break;
 
-                    case 0x0029: player_node->setAttributeEffective(ATK, value
-                                                           + ATTR_BONUS(ATK));
-                        player_node->setAttributeBase(ATK, value);
-                        break;
-                    case 0x002a: value += player_node->getAttributeBase(ATK);
-                        player_node->setAttributeEffective(ATK, value); break;
-
-                    case 0x002b: player_node->setAttributeEffective(MATK, value
-                                                           + ATTR_BONUS(MATK));
-                        player_node->setAttributeBase(MATK, value);
-                        if (statusWindow)
-                            statusWindow->update(StatusWindow::MP);
-                        break;
-                    case 0x002c: value += player_node->getAttributeBase(MATK);
-                        player_node->setAttributeEffective(MATK, value);
-                        if (statusWindow)
-                            statusWindow->update(StatusWindow::MP);
-                        break;
-                    case 0x002d: player_node->setAttributeEffective(DEF, value
-                                                           + ATTR_BONUS(DEF));
-                        player_node->setAttributeBase(DEF, value); break;
-                    case 0x002e: value += player_node->getAttributeBase(DEF);
-                        player_node->setAttributeEffective(DEF, value); break;
-
-                    case 0x002f: player_node->setAttributeEffective(MDEF, value
-                                                           + ATTR_BONUS(MDEF));
-                        player_node->setAttributeBase(MDEF, value); break;
-                    case 0x0030: value += player_node->getAttributeBase(MDEF);
-                        player_node->setAttributeEffective(MDEF, value); break;
-
-                    case 0x0031: player_node->setAttributeBase(HIT, value);
-                        player_node->setAttributeEffective(HIT, value); break;
-
-                    case 0x0032: player_node->setAttributeEffective(FLEE, value
-                                                           + ATTR_BONUS(FLEE));
-                        player_node->setAttributeBase(FLEE, value); break;
-                    case 0x0033: value += player_node->getAttributeBase(FLEE);
-                        player_node->setAttributeEffective(FLEE, value); break;
-
-                    case 0x0034: player_node->setAttributeBase(CRIT, value);
-                        player_node->setAttributeEffective(CRIT, value); break;
+                    case 0x0029: PlayerInfo::setStatBase(ATK, value); break;
+                    case 0x002a: PlayerInfo::setStatMod(ATK, value); break;
+
+                    case 0x002b: PlayerInfo::setStatBase(MATK, value); break;
+                    case 0x002c: PlayerInfo::setStatMod(MATK, value); break;
+
+                    case 0x002d: PlayerInfo::setStatBase(DEF, value); break;
+                    case 0x002e: PlayerInfo::setStatMod(DEF, value); break;
+
+                    case 0x002f: PlayerInfo::setStatBase(MDEF, value); break;
+                    case 0x0030: PlayerInfo::setStatMod(MDEF, value); break;
+
+                    case 0x0031: PlayerInfo::setStatBase(HIT, value); break;
+
+                    case 0x0032: PlayerInfo::setStatBase(FLEE, value); break;
+                    case 0x0033: PlayerInfo::setStatMod(FLEE, value); break;
+
+                    case 0x0034: PlayerInfo::setStatBase(CRIT, value); break;
 
                     case 0x0035: player_node->setAttackSpeed(value); break;
-                    case 0x0037: player_node->setAttributeBase(JOB, value);
-                        player_node->setAttributeEffective(JOB, value); break;
+
+                    case 0x0037: PlayerInfo::setStatBase(JOB, value); break;
+
                     case 500: player_node->setGMLevel(value); break;
                 }
 
-                if (player_node->getHp() == 0 && !deathNotice)
+                if (PlayerInfo::getAttribute(HP) == 0 && !deathNotice)
                 {
+                    viewport->shakeScreen(100);
                     deathNotice = new OkDialog(_("Message"),
                                                randomDeathMessage(),
                                                false);
@@ -331,29 +300,29 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
             switch (msg.readInt16())
             {
                 case 0x0001:
-                    player_node->setExp(msg.readInt32());
+                    PlayerInfo::setAttribute(EXP, msg.readInt32());
                     break;
                 case 0x0002:
-                    player_node->setExperience(JOB, msg.readInt32(),
-                                    player_node->getExperience(JOB).second);
+                    PlayerInfo::setStatExperience(JOB, msg.readInt32(),
+                                                  PlayerInfo::getStatExperience(JOB).second);
                     break;
                 case 0x0014: {
-                        int curGp = player_node->getMoney();
-                        player_node->setMoney(msg.readInt32());
-                        if (player_node->getMoney() > curGp)
-                            localChatTab->chatLog(strprintf(_("You picked up "
-                                                              "%s."),
-                                Units::formatCurrency(player_node->getMoney()
-                                    - curGp).c_str()), BY_SERVER);
+                        int oldMoney = PlayerInfo::getAttribute(MONEY);
+                        int newMoney = msg.readInt32();
+                        PlayerInfo::setAttribute(MONEY, newMoney);
+                        if (newMoney > oldMoney)
+                            SERVER_NOTICE(strprintf(_("You picked up %s."),
+                                         Units::formatCurrency(newMoney -
+                                         oldMoney).c_str()))
                     }
                     break;
                 case 0x0016:
-                    player_node->setExpNeeded(msg.readInt32());
+                    PlayerInfo::setAttribute(EXP_NEEDED, msg.readInt32());
                     break;
                 case 0x0017:
-                    player_node->setExperience(JOB,
-                                    player_node->getExperience(JOB).first,
-                                    msg.readInt32());
+                    PlayerInfo::setStatExperience(JOB,
+                                                  PlayerInfo::getStatExperience(JOB).first,
+                                                  msg.readInt32());
                     break;
             }
             break;
@@ -364,8 +333,8 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                 int base = msg.readInt32();
                 int bonus = msg.readInt32();
 
-                player_node->setAttributeBase(type, base);
-                player_node->setAttributeEffective(type, base + bonus);
+                PlayerInfo::setStatBase(type, base, false);
+                PlayerInfo::setStatMod(type, bonus);
             }
             break;
 
@@ -377,25 +346,20 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
 
                 if (ok != 1)
                 {
-                    localChatTab->chatLog(_("Cannot raise skill!"),
-                                          BY_SERVER);
+                    SERVER_NOTICE(_("Cannot raise skill!"))
                 }
 
-                int bonus = ATTR_BONUS(type);
-
-                player_node->setAttributeBase(type, value);
-                player_node->setAttributeEffective(type, value + bonus);
+                PlayerInfo::setStatBase(type, value);
             }
             break;
 
         // Updates stats and status points
         case SMSG_PLAYER_STAT_UPDATE_5:
-            player_node->setCharacterPoints(msg.readInt16());
+            PlayerInfo::setAttribute(CHAR_POINTS, msg.readInt16());
 
             {
                 int val = msg.readInt8();
-                player_node->setAttributeEffective(STR, val + ATTR_BONUS(STR));
-                player_node->setAttributeBase(STR, val);
+                PlayerInfo::setStatBase(STR, val);
                 if (val >= 99)
                 {
                     statusWindow->setPointsNeeded(STR, 0);
@@ -407,8 +371,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                 }
 
                 val = msg.readInt8();
-                player_node->setAttributeEffective(AGI, val + ATTR_BONUS(AGI));
-                player_node->setAttributeBase(AGI, val);
+                PlayerInfo::setStatBase(AGI, val);
                 if (val >= 99)
                 {
                     statusWindow->setPointsNeeded(AGI, 0);
@@ -420,8 +383,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                 }
 
                 val = msg.readInt8();
-                player_node->setAttributeEffective(VIT, val + ATTR_BONUS(VIT));
-                player_node->setAttributeBase(VIT, val);
+                PlayerInfo::setStatBase(VIT, val);
                 if (val >= 99)
                 {
                     statusWindow->setPointsNeeded(VIT, 0);
@@ -433,8 +395,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                 }
 
                 val = msg.readInt8();
-                player_node->setAttributeEffective(INT, val + ATTR_BONUS(INT));
-                player_node->setAttributeBase(INT, val);
+                PlayerInfo::setStatBase(INT, val);
                 if (val >= 99)
                 {
                     statusWindow->setPointsNeeded(INT, 0);
@@ -446,8 +407,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                 }
 
                 val = msg.readInt8();
-                player_node->setAttributeEffective(DEX, val + ATTR_BONUS(DEX));
-                player_node->setAttributeBase(DEX, val);
+                PlayerInfo::setStatBase(DEX, val);
                 if (val >= 99)
                 {
                     statusWindow->setPointsNeeded(DEX, 0);
@@ -459,8 +419,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                 }
 
                 val = msg.readInt8();
-                player_node->setAttributeEffective(LUK, val + ATTR_BONUS(LUK));
-                player_node->setAttributeBase(LUK, val);
+                PlayerInfo::setStatBase(LUK, val);
                 if (val >= 99)
                 {
                     statusWindow->setPointsNeeded(LUK, 0);
@@ -471,39 +430,25 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                     statusWindow->setPointsNeeded(LUK, msg.readInt8());
                 }
 
-                val = msg.readInt16(); // ATK
-                player_node->setAttributeBase(ATK, val);
-                val += msg.readInt16();  // ATK bonus
-                player_node->setAttributeEffective(ATK, val);
-
-                val = msg.readInt16(); // MATK
-                player_node->setAttributeBase(MATK, val);
-                val += msg.readInt16();  // MATK bonus
-                player_node->setAttributeEffective(MATK, val);
-                statusWindow->update(StatusWindow::MP);
-
-                val = msg.readInt16(); // DEF
-                player_node->setAttributeBase(DEF, val);
-                val += msg.readInt16();  // DEF bonus
-                player_node->setAttributeEffective(DEF, val);
-
-                val = msg.readInt16(); // MDEF
-                player_node->setAttributeBase(MDEF, val);
-                val += msg.readInt16();  // MDEF bonus
-                player_node->setAttributeEffective(MDEF, val);
-
-                val = msg.readInt16(); // HIT
-                player_node->setAttributeBase(HIT, val);
-                player_node->setAttributeEffective(HIT, val);
-
-                val = msg.readInt16(); // FLEE
-                player_node->setAttributeBase(FLEE, val);
-                val += msg.readInt16();  // FLEE bonus
-                player_node->setAttributeEffective(FLEE, val);
-
-                val = msg.readInt16();
-                player_node->setAttributeBase(CRIT, val);
-                player_node->setAttributeEffective(CRIT, val);
+                PlayerInfo::setStatBase(ATK, msg.readInt16(), false);
+                PlayerInfo::setStatMod(ATK, msg.readInt16());
+
+                PlayerInfo::setStatBase(MATK, msg.readInt16(), false);
+                PlayerInfo::setStatMod(MATK, msg.readInt16());
+
+
+                PlayerInfo::setStatBase(DEF, msg.readInt16(), false);
+                PlayerInfo::setStatMod(DEF, msg.readInt16());
+
+                PlayerInfo::setStatBase(MDEF, msg.readInt16(), false);
+                PlayerInfo::setStatMod(MDEF, msg.readInt16());
+
+                PlayerInfo::setStatBase(HIT, msg.readInt16());
+
+                PlayerInfo::setStatBase(FLEE, msg.readInt16(), false);
+                PlayerInfo::setStatMod(FLEE, msg.readInt16());
+
+                PlayerInfo::setStatBase(CRIT, msg.readInt16());
             }
 
             msg.readInt16();  // manner
@@ -540,8 +485,9 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                 switch (type)
                 {
                     case 0:
-                        localChatTab->chatLog(_("Equip arrows first."),
-                                             BY_SERVER);
+                        {
+                            SERVER_NOTICE(_("Equip arrows first."))
+                        }
                         break;
                     default:
                         logger->log("0x013b: Unhandled message %i", type);
@@ -582,7 +528,7 @@ void PlayerHandler::decreaseAttribute(int attr)
 
 void PlayerHandler::increaseSkill(int skillId)
 {
-    if (player_node->getSkillPoints() <= 0)
+    if (PlayerInfo::getAttribute(SKILL_POINTS) <= 0)
         return;
 
     MessageOut outMsg(CMSG_SKILL_LEVELUP_REQUEST);
@@ -591,8 +537,11 @@ void PlayerHandler::increaseSkill(int skillId)
 
 void PlayerHandler::pickUp(FloorItem *floorItem)
 {
-    MessageOut outMsg(CMSG_ITEM_PICKUP);
-    outMsg.writeInt32(floorItem->getId());
+    if (floorItem)
+    {
+        MessageOut outMsg(CMSG_ITEM_PICKUP);
+        outMsg.writeInt32(floorItem->getId());
+    }
 }
 
 void PlayerHandler::setDirection(char direction)
@@ -641,7 +590,7 @@ void PlayerHandler::ignoreAll(bool ignore)
 
 bool PlayerHandler::canUseMagic()
 {
-    return player_node->getAttributeEffective(MATK) > 0;
+    return PlayerInfo::getStatEffective(MATK) > 0;
 }
 
 bool PlayerHandler::canCorrectAttributes()
diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp
index c5f5d540..577bda7e 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/specialhandler.cpp
@@ -21,13 +21,12 @@
 
 #include "net/tmwa/specialhandler.h"
 
-#include "localplayer.h"
+#include "event.h"
 #include "log.h"
+#include "playerinfo.h"
 
 #include "gui/skilldialog.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/messagein.h"
 #include "net/messageout.h"
 
@@ -105,8 +104,7 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg)
                 msg.skip(24); // unused
                 int up = msg.readInt8();
 
-                player_node->setAttributeBase(skillId, level);
-                player_node->setAttributeEffective(skillId, level);
+                PlayerInfo::setStatBase(skillId, level);
                 skillDialog->setModifiable(skillId, up);
             }
             break;
@@ -119,8 +117,7 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg)
                 msg.readInt16(); // range
                 int up = msg.readInt8();
 
-                player_node->setAttributeBase(skillId, level);
-                player_node->setAttributeEffective(skillId, level);
+                PlayerInfo::setStatBase(skillId, level);
                 skillDialog->setModifiable(skillId, up);
             }
             break;
@@ -218,7 +215,7 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg)
                 }
             }
 
-            localChatTab->chatLog(msg);
+            SERVER_NOTICE(msg)
             break;
     }
 }
diff --git a/src/net/tmwa/token.h b/src/net/tmwa/token.h
index d2a21012..3e781cd8 100644
--- a/src/net/tmwa/token.h
+++ b/src/net/tmwa/token.h
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "player.h"
+#include "being.h"
 
 #ifndef NET_TA_TOKEN_H
 #define NET_TA_TOKEN_H
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 9089f8e6..034b959d 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -21,22 +21,24 @@
 
 #include "net/tmwa/tradehandler.h"
 
+#include "event.h"
 #include "inventory.h"
 #include "item.h"
 #include "localplayer.h"
+#include "playerinfo.h"
 #include "playerrelations.h"
 
 #include "gui/confirmdialog.h"
 #include "gui/trade.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/inventoryhandler.h"
 #include "net/messagein.h"
 #include "net/messageout.h"
 
 #include "net/tmwa/protocol.h"
 
+#include "resources/iteminfo.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
@@ -96,14 +98,14 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
                 if (player_relations.hasPermission(tradePartnerName,
                                                    PlayerRelation::TRADE))
                 {
-                    if (!player_node->tradeRequestOk() || confirmDlg)
+                    if (PlayerInfo::isTrading() || confirmDlg)
                     {
                         Net::getTradeHandler()->respond(false);
                         break;
                     }
 
                     tradePartnerName = tradePartnerNameTemp;
-                    player_node->setTrading(true);
+                    PlayerInfo::setTrading(true);
                     confirmDlg = new ConfirmDialog(_("Request for Trade"),
                             strprintf(_("%s wants to trade with you, do you "
                                       "accept?"), tradePartnerName.c_str()));
@@ -121,16 +123,16 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
             switch (msg.readInt8())
             {
                 case 0: // Too far away
-                    localChatTab->chatLog(_("Trading isn't possible. Trade "
-                            "partner is too far away."), BY_SERVER);
+                    SERVER_NOTICE(_("Trading isn't possible. Trade "
+                            "partner is too far away."))
                     break;
                 case 1: // Character doesn't exist
-                    localChatTab->chatLog(_("Trading isn't possible. Character "
-                            "doesn't exist."), BY_SERVER);
+                    SERVER_NOTICE(_("Trading isn't possible. Character "
+                            "doesn't exist."))
                     break;
                 case 2: // Invite request check failed...
-                    localChatTab->chatLog(_("Trade cancelled due to an unknown "
-                            "reason."), BY_SERVER);
+                    SERVER_NOTICE(_("Trade cancelled due to an unknown "
+                            "reason."))
                     break;
                 case 3: // Trade accepted
                     tradeWindow->reset();
@@ -141,17 +143,15 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
                 case 4: // Trade cancelled
                     if (player_relations.hasPermission(tradePartnerName,
                                                        PlayerRelation::SPEECH_LOG))
-                        localChatTab->chatLog(strprintf(_("Trade with %s "
-                                "cancelled."), tradePartnerName.c_str()),
-                                BY_SERVER);
+                        SERVER_NOTICE(strprintf(_("Trade with %s cancelled."),
+                                      tradePartnerName.c_str()))
                     // otherwise ignore silently
 
                     tradeWindow->setVisible(false);
-                    player_node->setTrading(false);
+                    PlayerInfo::setTrading(false);
                     break;
                 default: // Shouldn't happen as well, but to be sure
-                    localChatTab->chatLog(_("Unhandled trade cancel packet."),
-                            BY_SERVER);
+                    SERVER_NOTICE(_("Unhandled trade cancel packet."))
                     break;
             }
             break;
@@ -169,7 +169,7 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
                 if (type == 0)
                     tradeWindow->setMoney(amount);
                 else
-                    tradeWindow->addItem(type, false, amount, false);
+                    tradeWindow->addItem(type, false, amount);
             }
             break;
 
@@ -177,7 +177,7 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
             // Trade: New Item add response (was 0x00ea, now 01b1)
             {
                 const int index = msg.readInt16() - INVENTORY_OFFSET;
-                Item *item = player_node->getInventory()->getItem(index);
+                Item *item = PlayerInfo::getInventory()->getItem(index);
                 if (!item)
                 {
                     tradeWindow->receivedOk(true);
@@ -189,27 +189,27 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
                 {
                     case 0:
                         // Successfully added item
-                        if (item->isEquipment() && item->isEquipped())
+                        if (item->isEquippable() && item->isEquipped())
                         {
-                            Net::getInventoryHandler()->unequipItem(item);
+                            item->doEvent(EVENT_DOUNEQUIP);
                         }
-                        tradeWindow->addItem(item->getId(), true, quantity,
-                                item->isEquipment());
+                        tradeWindow->addItem(item->getId(), true, quantity);
+
                         item->increaseQuantity(-quantity);
                         break;
                     case 1:
                         // Add item failed - player overweighted
-                        localChatTab->chatLog(_("Failed adding item. Trade "
-                                "partner is over weighted."), BY_SERVER);
+                        SERVER_NOTICE(_("Failed adding item. Trade "
+                                "partner is over weighted."))
                         break;
                     case 2:
                          // Add item failed - player has no free slot
-                         localChatTab->chatLog(_("Failed adding item. Trade "
-                                 "partner has no free slot."), BY_SERVER);
+                         SERVER_NOTICE(_("Failed adding item. Trade "
+                                 "partner has no free slot."))
                          break;
                     default:
-                        localChatTab->chatLog(_("Failed adding item for "
-                                "unknown reason."), BY_SERVER);
+                        SERVER_NOTICE(_("Failed adding item for "
+                                "unknown reason."))
                         break;
                 }
             }
@@ -221,17 +221,17 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
             break;
 
         case SMSG_TRADE_CANCEL:
-            localChatTab->chatLog(_("Trade canceled."), BY_SERVER);
+            SERVER_NOTICE(_("Trade canceled."))
             tradeWindow->setVisible(false);
             tradeWindow->reset();
-            player_node->setTrading(false);
+            PlayerInfo::setTrading(false);
             break;
 
         case SMSG_TRADE_COMPLETE:
-            localChatTab->chatLog(_("Trade completed."), BY_SERVER);
+            SERVER_NOTICE(_("Trade completed."))
             tradeWindow->setVisible(false);
             tradeWindow->reset();
-            player_node->setTrading(false);
+            PlayerInfo::setTrading(false);
             break;
     }
 }
@@ -245,7 +245,7 @@ void TradeHandler::request(Being *being)
 void TradeHandler::respond(bool accept)
 {
     if (!accept)
-        player_node->setTrading(false);
+        PlayerInfo::setTrading(false);
 
     MessageOut outMsg(CMSG_TRADE_RESPONSE);
     outMsg.writeInt8(accept ? 3 : 4);
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 30798c41..ea3c4550 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -30,6 +30,8 @@ namespace Net {
 class TradeHandler
 {
     public:
+        virtual ~TradeHandler() {}
+
         virtual void request(Being *being) {}
 
         virtual void respond(bool accept) {}
@@ -45,8 +47,6 @@ class TradeHandler
         virtual void finish() {}
 
         virtual void cancel() {}
-
-        virtual ~TradeHandler() {}
 };
 }
 
diff --git a/src/npc.cpp b/src/npc.cpp
deleted file mode 100644
index a3c26618..00000000
--- a/src/npc.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "animatedsprite.h"
-#include "beingmanager.h"
-#include "npc.h"
-#include "particle.h"
-#include "text.h"
-
-#include "gui/buy.h"
-#include "gui/buysell.h"
-#include "gui/npcdialog.h"
-#include "gui/npcpostdialog.h"
-#include "gui/userpalette.h"
-#include "gui/sell.h"
-
-#include "net/net.h"
-#include "net/npchandler.h"
-
-#include "resources/npcdb.h"
-#include "configuration.h"
-
-NPC::NPC(int id, int subtype, Map *map):
-    Player(id, subtype, map, true)
-{
-    setSubtype(subtype);
-
-    setShowName(true);
-}
-
-void NPC::setName(const std::string &name)
-{
-    const std::string displayName = name.substr(0, name.find('#', 0));
-
-    Being::setName(displayName);
-
-    mNameColor = &userPalette->getColor(UserPalette::NPC);
-
-    mDispName->setColor(mNameColor);
-}
-
-void NPC::setSubtype(Uint16 subtype)
-{
-    Being::setSubtype(subtype);
-
-    NPCInfo info = NPCDB::get(subtype);
-
-    mSprites.clear();
-    // Setup NPC sprites
-    for (std::list<NPCsprite*>::const_iterator i = info.sprites.begin();
-         i != info.sprites.end();
-         i++)
-    {
-        std::string file = paths.getValue("sprites",
-                                          "graphics/sprites/") + (*i)->sprite;
-        int variant = (*i)->variant;
-        mSprites.push_back(AnimatedSprite::load(file, variant));
-        mSpriteIDs.push_back(0);
-        mSpriteColors.push_back("");
-    }
-
-    if (Particle::enabled)
-    {
-        //setup particle effects
-        for (std::list<std::string>::const_iterator i = info.particles.begin();
-             i != info.particles.end();
-             i++)
-        {
-            Particle *p = particleEngine->addEffect(*i, 0, 0);
-            this->controlParticle(p);
-        }
-    }
-}
-
-void NPC::talk()
-{
-    Net::getNpcHandler()->talk(mId);
-}
-
-void NPC::setSprite(unsigned int slot, int id, const std::string &color)
-{
-    // Do nothing
-}
-
-bool NPC::isTalking()
-{
-    return NpcDialog::isActive() || BuyDialog::isActive() ||
-           SellDialog::isActive() || BuySellDialog::isActive() ||
-           NpcPostDialog::isActive();
-}
diff --git a/src/npc.h b/src/npc.h
deleted file mode 100644
index 0abd2395..00000000
--- a/src/npc.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef NPC_H
-#define NPC_H
-
-#include "player.h"
-
-class Graphics;
-class Text;
-
-class NPC : public Player
-{
-    public:
-        NPC(int id, int subtype, Map *map);
-
-        void setName(const std::string &name);
-
-        virtual Type getType() const { return Being::NPC; }
-
-        virtual void setSubtype(Uint16 subtype);
-
-        void talk();
-
-        void setSprite(unsigned int slot, int id,
-                        const std::string &color = "");
-
-        /**
-         * Gets the way an NPC is blocked by other things on the map
-         */
-        virtual unsigned char getWalkMask() const
-        {
-            return Map::BLOCKMASK_WALL
-                    | Map::BLOCKMASK_CHARACTER
-                    | Map::BLOCKMASK_MONSTER;
-        }
-
-        /** We consider NPCs (at least for now) to be one layer-sprites */
-        virtual int getNumberOfLayers() const
-        { return 1; }
-
-        static bool isTalking();
-
-    protected:
-        /**
-         * Gets the way a monster blocks pathfinding for other objects
-         */
-        virtual Map::BlockType getBlockType() const
-        { return Map::BLOCKTYPE_CHARACTER; } //blocks like a player character
-
-        // Colors don't change for NPCs
-        virtual void updateColors() {}
-};
-
-#endif
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 7818e9d2..c24b7d64 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -25,8 +25,6 @@
 
 #include "resources/image.h"
 
-#include "utils/stringutils.h"
-
 #ifdef USE_OPENGL
 
 #ifdef __APPLE__
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index ee96e19c..23638eec 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -22,8 +22,6 @@
 #ifndef OPENGLGRAPHICS_H
 #define OPENGLGRAPHICS_H
 
-#include "main.h"
-
 #include "graphics.h"
 
 #ifdef USE_OPENGL
diff --git a/src/particle.cpp b/src/particle.cpp
index 0c4a7d7e..f147a9f2 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -56,15 +56,15 @@ bool Particle::enabled = true;
 const float Particle::PARTICLE_SKY = 800.0f;
 
 Particle::Particle(Map *map):
-    mAlive(true),
+    mAlpha(1.0f),
     mLifetimeLeft(-1),
     mLifetimePast(0),
     mFadeOut(0),
     mFadeIn(0),
-    mAlpha(1.0f),
+    mAlive(ALIVE),
     mAutoDelete(true),
-    mMap(map),
     mAllowSizeAdjust(false),
+    mDeathEffectConditions(0x00),
     mGravity(0.0f),
     mRandomness(0),
     mBounce(0.0f),
@@ -74,33 +74,31 @@ Particle::Particle(Map *map):
     mInvDieDistance(-1.0f),
     mMomentum(1.0f)
 {
+    setMap(map);
     Particle::particleCount++;
-    if (mMap)
-        setSpriteIterator(mMap->addSprite(this));
 }
 
 Particle::~Particle()
 {
-    // Remove from map sprite list
-    if (mMap)
-        mMap->removeSprite(mSpriteIterator);
     // Delete child emitters and child particles
     clear();
+    //update particle count
     Particle::particleCount--;
 }
 
 void Particle::setupEngine()
 {
-    Particle::maxCount = (int)config.getValue("particleMaxCount", 3000);
-    Particle::fastPhysics = (int)config.getValue("particleFastPhysics", 0);
-    Particle::emitterSkip = (int)config.getValue("particleEmitterSkip", 1) + 1;
-    Particle::enabled = (bool)config.getValue("particleeffects", true);
+    Particle::maxCount = config.getIntValue("particleMaxCount");
+    Particle::fastPhysics = config.getIntValue("particleFastPhysics");
+    Particle::emitterSkip = config.getIntValue("particleEmitterSkip") + 1;
+    Particle::enabled = config.getBoolValue("particleeffects");
     disableAutoDelete();
     logger->log("Particle engine set up");
 }
 
-void Particle::draw(Graphics *, int, int) const
+bool Particle::draw(Graphics *, int, int) const
 {
+    return false;
 }
 
 bool Particle::update()
@@ -108,12 +106,12 @@ bool Particle::update()
     if (!mMap)
         return false;
 
-    if (mLifetimeLeft == 0)
-        mAlive = false;
+    if (mLifetimeLeft == 0 && mAlive == ALIVE)
+        mAlive = DEAD_TIMEOUT;
 
     Vector oldPos = mPos;
 
-    if (mAlive)
+    if (mAlive == ALIVE)
     {
         //calculate particle movement
         if (mMomentum != 1.0f)
@@ -147,7 +145,7 @@ bool Particle::update()
             {
                 if (mInvDieDistance > 0.0f && invHypotenuse > mInvDieDistance)
                 {
-                    mAlive = false;
+                    mAlive = DEAD_IMPACT;
                 }
                 float accFactor = invHypotenuse * mAcceleration;
                 mVelocity -= dist * accFactor;
@@ -175,7 +173,7 @@ bool Particle::update()
         }
         mLifetimePast++;
 
-        if (mPos.z > PARTICLE_SKY || mPos.z < 0.0f)
+        if (mPos.z < 0.0f)
         {
             if (mBounce > 0.0f)
             {
@@ -185,9 +183,13 @@ bool Particle::update()
             }
             else
             {
-                mAlive = false;
+                mAlive = DEAD_FLOOR;
             }
         }
+        else if (mPos.z > PARTICLE_SKY)
+        {
+                mAlive = DEAD_SKY;
+        }
 
         // Update child emitters
         if ((mLifetimePast-1)%Particle::emitterSkip == 0)
@@ -206,6 +208,17 @@ bool Particle::update()
         }
     }
 
+    // create death effect when the particle died
+    if (mAlive != ALIVE && mAlive != DEAD_LONG_AGO)
+    {
+        if ((mAlive & mDeathEffectConditions) > 0x00  && !mDeathEffect.empty())
+        {
+            Particle* deathEffect = particleEngine->addEffect(mDeathEffect, 0, 0);
+            deathEffect->moveBy(mPos);
+        }
+        mAlive = DEAD_LONG_AGO;
+    }
+
     Vector change = mPos - oldPos;
 
     // Update child particles
@@ -229,7 +242,7 @@ bool Particle::update()
             p = mChildParticles.erase(p);
         }
     }
-    if (!mAlive && mChildParticles.empty() && mAutoDelete)
+    if (mAlive != ALIVE && mChildParticles.empty() && mAutoDelete)
     {
         return false;
     }
@@ -329,13 +342,39 @@ Particle *Particle::addEffect(const std::string &particleEffectFile,
         // Look for additional emitters for this particle
         for_each_xml_child_node(emitterNode, effectChildNode)
         {
-            if (!xmlStrEqual(emitterNode->name, BAD_CAST "emitter"))
-                continue;
-
-            ParticleEmitter *newEmitter;
-            newEmitter = new ParticleEmitter(emitterNode, newParticle, mMap,
-                                             rotation);
-            newParticle->addEmitter(newEmitter);
+            if (xmlStrEqual(emitterNode->name, BAD_CAST "emitter"))
+            {
+                ParticleEmitter *newEmitter;
+                newEmitter = new ParticleEmitter(emitterNode, newParticle, mMap,
+                                                 rotation);
+                newParticle->addEmitter(newEmitter);
+            }
+            else if (xmlStrEqual(emitterNode->name, BAD_CAST "deatheffect"))
+            {
+                std::string deathEffect = (const char*)emitterNode->xmlChildrenNode->content;
+                char deathEffectConditions = 0x00;
+                if (XML::getBoolProperty(emitterNode, "on-floor", true))
+                {
+                    deathEffectConditions += Particle::DEAD_FLOOR;
+                }
+                if (XML::getBoolProperty(emitterNode, "on-sky", true))
+                {
+                    deathEffectConditions += Particle::DEAD_SKY;
+                }
+                if (XML::getBoolProperty(emitterNode, "on-other", false))
+                {
+                    deathEffectConditions += Particle::DEAD_OTHER;
+                }
+                if (XML::getBoolProperty(emitterNode, "on-impact", true))
+                {
+                    deathEffectConditions += Particle::DEAD_IMPACT;
+                }
+                if (XML::getBoolProperty(emitterNode, "on-timeout", true))
+                {
+                    deathEffectConditions += Particle::DEAD_TIMEOUT;
+                }
+                newParticle->setDeathEffect(deathEffect, deathEffectConditions);
+            }
         }
 
         mChildParticles.push_back(newParticle);
@@ -406,13 +445,6 @@ float Particle::getCurrentAlpha() const
     return alpha;
 }
 
-void Particle::setMap(Map *map)
-{
-    mMap = map;
-    if (mMap)
-        setSpriteIterator(mMap->addSprite(this));
-}
-
 void Particle::clear()
 {
     delete_all(mChildEmitters);
diff --git a/src/particle.h b/src/particle.h
index 69f8c2be..0e39883b 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -22,8 +22,8 @@
 #ifndef PARTICLE_H
 #define PARTICLE_H
 
+#include "actor.h"
 #include "guichanfwd.h"
-#include "sprite.h"
 #include "vector.h"
 
 #include <list>
@@ -41,9 +41,19 @@ typedef Emitters::iterator EmitterIterator;
 /**
  * A particle spawned by a ParticleEmitter.
  */
-class Particle : public Sprite
+class Particle : public Actor
 {
     public:
+        enum AliveStatus
+        {
+            ALIVE = 0,
+            DEAD_TIMEOUT = 1,
+            DEAD_FLOOR = 2,
+            DEAD_SKY = 4,
+            DEAD_IMPACT = 8,
+            DEAD_OTHER = 16,
+            DEAD_LONG_AGO = 128
+        };
         static const float PARTICLE_SKY; /**< Maximum Z position of particles */
         static int fastPhysics;          /**< Mode of squareroot calculation */
         static int particleCount;        /**< Current number of particles */
@@ -83,7 +93,7 @@ class Particle : public Sprite
         /**
          * Draws the particle image.
          */
-        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const;
+        virtual bool draw(Graphics *graphics, int offsetX, int offsetY) const;
 
         /**
          * Necessary for sorting with the other sprites.
@@ -92,12 +102,6 @@ class Particle : public Sprite
         { return (int) (mPos.y + mPos.z) - 64; }
 
         /**
-         * Sets the map the particle is on.
-         */
-        void setMap(Map *map);
-
-
-        /**
          * Creates a blank particle as a child of the current particle
          * Useful for creating target particles
          */
@@ -142,12 +146,6 @@ class Particle : public Sprite
         void moveTo(float x, float y);
 
         /**
-         * Returns the particle position.
-         */
-        const Vector& getPosition() const
-        { return mPos; }
-
-        /**
          * Changes the particle position relative
          */
         void moveBy (const Vector &change);
@@ -173,32 +171,6 @@ class Particle : public Sprite
         { mFadeIn = fadeIn; }
 
         /**
-         * Sets the alpha value of the particle
-         */
-        void setAlpha(float alpha)
-        { mAlpha = alpha; }
-
-        /**
-         * Returns the current alpha opacity of the particle.
-         */
-        virtual float getAlpha() const
-        { return mAlpha; }
-
-        /**
-         * Sets the sprite iterator of the particle on the current map to make
-         * it easier to remove the particle from the map when it is destroyed.
-         */
-        void setSpriteIterator(std::list<Sprite*>::iterator spriteIterator)
-        { mSpriteIterator = spriteIterator; }
-
-        /**
-         * Gets the sprite iterator of the particle on the current map.
-         */
-        std::list<Sprite*>::iterator
-        getSpriteIterator() const
-        { return mSpriteIterator; }
-
-        /**
          * Sets the current velocity in 3 dimensional space.
          */
         void setVelocity(float x, float y, float z)
@@ -259,20 +231,20 @@ class Particle : public Sprite
         void setAllowSizeAdjust(bool adjust)
         { mAllowSizeAdjust = adjust; }
 
-        bool isAlive()
-        { return mAlive; }
+        bool isAlive() const
+        { return mAlive == ALIVE; }
 
         /**
          * Determines whether the particle and its children are all dead
          */
-        bool isExtinct()
+        bool isExtinct() const
         { return !isAlive() && mChildParticles.empty(); }
 
         /**
          * Manually marks the particle for deletion.
          */
         void kill()
-        { mAlive = false; mAutoDelete = true; }
+        { mAlive = DEAD_OTHER; mAutoDelete = true; }
 
         /**
          * After calling this function the particle will only request
@@ -285,28 +257,38 @@ class Particle : public Sprite
         virtual int getNumberOfLayers() const
         { return 1; }
 
+        virtual float getAlpha() const
+        { return 1.0f; }
+
+        virtual void setAlpha(float alpha) {}
+
+        virtual void setDeathEffect(const std::string &effectFile, char conditions)
+        { mDeathEffect = effectFile; mDeathEffectConditions = conditions; }
+
     protected:
+        /** Opacity of the graphical representation of the particle */
+        float mAlpha;
+
         /** Calculates the current alpha transparency taking current fade status into account*/
         float getCurrentAlpha() const;
 
-        bool mAlive;                /**< Is the particle supposed to be drawn and updated?*/
-        Vector mPos;                /**< Position in pixels relative to map. */
         int mLifetimeLeft;          /**< Lifetime left in game ticks*/
         int mLifetimePast;          /**< Age of the particle in game ticks*/
         int mFadeOut;               /**< Lifetime in game ticks left where fading out begins*/
         int mFadeIn;                /**< Age in game ticks where fading in is finished*/
-        float mAlpha;               /**< Opacity of the graphical representation of the particle */
+        Vector mVelocity;           /**< Speed in pixels per game-tick. */
 
+    private:
+        AliveStatus mAlive;                 /**< Is the particle supposed to be drawn and updated?*/
         // generic properties
         bool mAutoDelete;           /**< May the particle request its deletion by the parent particle? */
-        Map *mMap;                  /**< Map the particle is on. */
-        std::list<Sprite*>::iterator mSpriteIterator;   /**< iterator of the particle on the current map */
         Emitters mChildEmitters;    /**< List of child emitters. */
         Particles mChildParticles;  /**< List of particles controlled by this particle */
         bool mAllowSizeAdjust;      /**< Can the effect size be adjusted by the object props in the map file? */
+        std::string mDeathEffect;   /**< Particle effect file to be spawned when the particle dies */
+        char mDeathEffectConditions;/**< Bitfield of death conditions which trigger spawning of the death particle */
 
         // dynamic particle
-        Vector mVelocity;           /**< Speed in pixels per game-tick. */
         float mGravity;             /**< Downward acceleration in pixels per game-tick. */
         int mRandomness;            /**< Ammount of random vector change */
         float mBounce;              /**< How much the particle bounces off when hitting the ground */
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index dc9931a5..b9855c10 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -320,6 +320,30 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *
                     mParticleAnimation.addTerminator();
                 }
             } // for frameNode
+        } else if (xmlStrEqual(propertyNode->name, BAD_CAST "deatheffect"))
+        {
+            mDeathEffect = (const char*)propertyNode->xmlChildrenNode->content;
+            mDeathEffectConditions = 0x00;
+            if (XML::getBoolProperty(propertyNode, "on-floor", true))
+            {
+                mDeathEffectConditions += Particle::DEAD_FLOOR;
+            }
+            if (XML::getBoolProperty(propertyNode, "on-sky", true))
+            {
+                mDeathEffectConditions += Particle::DEAD_SKY;
+            }
+            if (XML::getBoolProperty(propertyNode, "on-other", false))
+            {
+                mDeathEffectConditions += Particle::DEAD_OTHER;
+            }
+            if (XML::getBoolProperty(propertyNode, "on-impact", true))
+            {
+                mDeathEffectConditions += Particle::DEAD_IMPACT;
+            }
+            if (XML::getBoolProperty(propertyNode, "on-timeout", true))
+            {
+                mDeathEffectConditions += Particle::DEAD_TIMEOUT;
+            }
         }
     }
 }
@@ -469,6 +493,11 @@ std::list<Particle *> ParticleEmitter::createParticles(int tick)
             newParticle->addEmitter(new ParticleEmitter(*i));
         }
 
+        if (!mDeathEffect.empty())
+        {
+            newParticle->setDeathEffect(mDeathEffect, mDeathEffectConditions);
+        }
+
         newParticles.push_back(newParticle);
     }
 
diff --git a/src/particleemitter.h b/src/particleemitter.h
index cc073c1c..9baaa73c 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -127,13 +127,19 @@ class ParticleEmitter
         int mOutputPauseLeft;
 
         /*
-         * Graphical representation of the particle
+         * Graphical representation of the particles
          */
         Image *mParticleImage; /**< Particle image, if used */
         Animation mParticleAnimation; /**< Filename of particle animation file */
         Animation mParticleRotation; /**< Filename of particle rotation file */
         ParticleEmitterProp<float> mParticleAlpha; /**< Opacity of the graphical representation of the particles */
 
+        /*
+         * Death effect of the particles
+         */
+        std::string mDeathEffect;
+        char mDeathEffectConditions;
+
         /** List of emitters the spawned particles are equipped with */
         std::list<ParticleEmitter> mParticleChildEmitters;
 };
diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h
index c7b12097..c73d044c 100644
--- a/src/particleemitterprop.h
+++ b/src/particleemitterprop.h
@@ -21,10 +21,6 @@
 
 #include <cmath>
 
-/**
- * Returns a random numeric value that is larger than or equal min and smaller
- * than max
- */
 
 enum ChangeFunc
 {
diff --git a/src/party.cpp b/src/party.cpp
index 155de2ba..99295792 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -20,8 +20,7 @@
 
 #include "party.h"
 
-#include "beingmanager.h"
-#include "player.h"
+#include "actorspritemanager.h"
 
 PartyMember::PartyMember(Party *party, int id, const std::string &name):
         Avatar(name), mId(id), mParty(party), mLeader(false)
@@ -144,9 +143,9 @@ void Party::removeFromMembers()
                                itr_end = mMembers.end();
     while(itr != itr_end)
     {
-        Being *b = beingManager->findBeing((*itr)->getID());
-        if (b && b->getType() == Being::PLAYER)
-            static_cast<Player*>(b)->setParty(NULL);
+        Being *b = actorSpriteManager->findBeing((*itr)->getID());
+        if (b)
+            b->setParty(NULL);
         ++itr;
     }
 }
diff --git a/src/player.cpp b/src/player.cpp
deleted file mode 100644
index a5a79ff1..00000000
--- a/src/player.cpp
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "player.h"
-
-#include "animatedsprite.h"
-#include "client.h"
-#include "configuration.h"
-#include "guild.h"
-#include "localplayer.h"
-#include "particle.h"
-#include "party.h"
-#include "text.h"
-
-#include "gui/socialwindow.h"
-#include "gui/theme.h"
-#include "gui/userpalette.h"
-
-#include "net/charhandler.h"
-#include "net/net.h"
-
-#include "resources/colordb.h"
-#include "resources/itemdb.h"
-#include "resources/iteminfo.h"
-
-#include "utils/stringutils.h"
-
-Player::Player(int id, int subtype, Map *map, bool isNPC):
-    Being(id, subtype, map),
-    mGender(GENDER_UNSPECIFIED),
-    mParty(NULL),
-    mIsGM(false),
-    mIp(0)
-{
-    if (!isNPC)
-    {
-        for (int i = 0; i < Net::getCharHandler()->maxSprite(); i++)
-        {
-            mSprites.push_back(NULL);
-            mSpriteIDs.push_back(0);
-            mSpriteColors.push_back("");
-        }
-
-        setSubtype(subtype);
-    }
-    mShowName = config.getValue("visiblenames", 1);
-    config.addListener("visiblenames", this);
-
-    updateColors();
-}
-
-Player::~Player()
-{
-    config.removeListener("visiblenames", this);
-}
-
-void Player::logic()
-{
-    if (Net::getNetworkType() == ServerInfo::TMWATHENA)
-    {
-        switch (mAction)
-        {
-            case STAND:
-            case SIT:
-            case DEAD:
-            case HURT:
-               break;
-
-            case WALK:
-                mFrame = (int) ((get_elapsed_time(mWalkTime) * 6)
-                         / getWalkSpeed().x);
-                if (mFrame >= 6)
-                    nextTile();
-                break;
-
-            case ATTACK:
-                int rotation = 0;
-                std::string particleEffect = "";
-                int frames = 4;
-
-                if (mEquippedWeapon &&
-                    mEquippedWeapon->getAttackType() == ACTION_ATTACK_BOW)
-                {
-                    frames = 5;
-                }
-
-                mFrame = (get_elapsed_time(mWalkTime) * frames) / mAttackSpeed;
-
-                //attack particle effect
-                if (mEquippedWeapon)
-                    particleEffect = mEquippedWeapon->getParticleEffect();
-
-                if (!particleEffect.empty() && Particle::enabled && mFrame == 1)
-                {
-                    switch (mDirection)
-                    {
-                        case DOWN: rotation = 0; break;
-                        case LEFT: rotation = 90; break;
-                        case UP: rotation = 180; break;
-                        case RIGHT: rotation = 270; break;
-                        default: break;
-                    }
-                    Particle *p;
-                    p = particleEngine->addEffect(
-                                          paths.getValue("particles",
-                                          "graphics/particles/")
-                                          + particleEffect, 0, 0, rotation);
-                    controlParticle(p);
-                }
-
-                if (mFrame >= frames)
-                    nextTile();
-
-                break;
-        }
-    }
-
-    Being::logic();
-}
-
-void Player::setSubtype(Uint16 subtype)
-{
-    Being::setSubtype(subtype);
-
-    int id = -100 - subtype;
-    if (ItemDB::exists(id)) // Prevent showing errors when sprite doesn't exist
-        setSprite(Net::getCharHandler()->baseSprite(), id);
-    else
-        setSprite(Net::getCharHandler()->baseSprite(), -100);
-}
-
-void Player::setGender(Gender gender)
-{
-    if (gender != mGender)
-    {
-        mGender = gender;
-
-        // Reload all subsprites
-        for (unsigned int i = 0; i < mSprites.size(); i++)
-        {
-            if (mSpriteIDs.at(i) != 0)
-                setSprite(i, mSpriteIDs.at(i), mSpriteColors.at(i));
-        }
-    }
-}
-
-void Player::setGM(bool gm)
-{
-    mIsGM = gm;
-
-    updateColors();
-}
-
-void Player::setSprite(int slot, int id, const std::string &color,
-                       bool isWeapon)
-{
-    if (getType() == NPC)
-        return;
-
-    assert(slot < Net::getCharHandler()->maxSprite());
-
-    // id = 0 means unequip
-    if (id == 0)
-    {
-        delete mSprites[slot];
-        mSprites[slot] = NULL;
-
-        if (isWeapon)
-            mEquippedWeapon = NULL;
-    }
-    else
-    {
-        std::string filename = ItemDB::get(id).getSprite(mGender);
-        AnimatedSprite *equipmentSprite = NULL;
-
-        if (!filename.empty())
-        {
-            if (!color.empty())
-                filename += "|" + color;
-
-            equipmentSprite = AnimatedSprite::load(
-              paths.getValue("sprites", "graphics/sprites/") + filename);
-        }
-
-        if (equipmentSprite)
-            equipmentSprite->setDirection(getSpriteDirection());
-
-        if (mSprites[slot])
-            delete mSprites[slot];
-
-        mSprites[slot] = equipmentSprite;
-
-        if (isWeapon)
-            mEquippedWeapon = &ItemDB::get(id);
-
-        setAction(mAction);
-    }
-
-    mSpriteIDs[slot] = id;
-    mSpriteColors[slot] = color;
-}
-
-void Player::setSpriteID(unsigned int slot, int id)
-{
-    setSprite(slot, id, mSpriteColors[slot]);
-}
-
-void Player::setSpriteColor(unsigned int slot, const std::string &color)
-{
-    setSprite(slot, mSpriteIDs[slot], color);
-}
-
-void Player::addGuild(Guild *guild)
-{
-    mGuilds[guild->getId()] = guild;
-    guild->addMember(mId, mName);
-
-    if (this == player_node && socialWindow)
-    {
-        socialWindow->addTab(guild);
-    }
-}
-
-void Player::removeGuild(int id)
-{
-    if (this == player_node && socialWindow)
-    {
-        socialWindow->removeTab(mGuilds[id]);
-    }
-
-    mGuilds[id]->removeMember(mId);
-    mGuilds.erase(id);
-}
-
-Guild *Player::getGuild(const std::string &guildName) const
-{
-    std::map<int, Guild*>::const_iterator itr, itr_end = mGuilds.end();
-    for (itr = mGuilds.begin(); itr != itr_end; ++itr)
-    {
-        Guild *guild = itr->second;
-        if (guild->getName() == guildName)
-        {
-            return guild;
-        }
-    }
-
-    return NULL;
-}
-
-Guild *Player::getGuild(int id) const
-{
-    std::map<int, Guild*>::const_iterator itr;
-    itr = mGuilds.find(id);
-    if (itr != mGuilds.end())
-    {
-        return itr->second;
-    }
-
-    return NULL;
-}
-
-const std::map<int, Guild*> &Player::getGuilds() const
-{
-    return mGuilds;
-}
-
-void Player::clearGuilds()
-{
-    std::map<int, Guild*>::const_iterator itr, itr_end = mGuilds.end();
-    for (itr = mGuilds.begin(); itr != itr_end; ++itr)
-    {
-        Guild *guild = itr->second;
-
-        if (this == player_node && socialWindow)
-            socialWindow->removeTab(guild);
-
-        guild->removeMember(mId);
-    }
-
-    mGuilds.clear();
-}
-
-void Player::setParty(Party *party)
-{
-    if (party == mParty)
-        return;
-
-    Party *old = mParty;
-    mParty = party;
-
-    if (old)
-    {
-        old->removeMember(mId);
-    }
-
-    if (party)
-    {
-        party->addMember(mId, mName);
-    }
-
-    updateColors();
-
-    if (this == player_node && socialWindow)
-    {
-        if (old)
-            socialWindow->removeTab(old);
-
-        if (party)
-            socialWindow->addTab(party);
-    }
-}
-
-void Player::optionChanged(const std::string &value)
-{
-    if (value == "visiblenames")
-    {
-        setShowName(config.getValue("visiblenames", 1));
-    }
-}
-
-void Player::updateColors()
-{
-    mTextColor = &userPalette->getColor(Theme::PLAYER);
-
-    if (mIsGM)
-    {
-        mTextColor = &userPalette->getColor(Theme::GM);
-        mNameColor = &userPalette->getColor(UserPalette::GM);
-    }
-    else if (mParty && mParty == player_node->getParty())
-    {
-        mNameColor = &userPalette->getColor(UserPalette::PARTY);
-    }
-    else
-    {
-        mNameColor = &userPalette->getColor(UserPalette::PC);
-    }
-
-    if (mDispName)
-    {
-        mDispName->setColor(mNameColor);
-    }
-}
diff --git a/src/player.h b/src/player.h
deleted file mode 100644
index 4ac9d0eb..00000000
--- a/src/player.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef PLAYER_H
-#define PLAYER_H
-
-#include "being.h"
-
-class Graphics;
-class Guild;
-class Map;
-class Party;
-
-enum Gender
-{
-    GENDER_MALE = 0,
-    GENDER_FEMALE = 1,
-    GENDER_UNSPECIFIED = 2
-};
-
-/**
- * A player being. Players have their name drawn beneath them. This class also
- * implements player-specific loading of base sprite, hair sprite and equipment
- * sprites.
- */
-class Player : public Being
-{
-    public:
-        /**
-         * Constructor.
-         */
-        Player(int id, int subtype, Map *map, bool isNPC = false);
-
-        ~Player();
-
-        virtual void logic();
-
-        virtual Type getType() const { return PLAYER; }
-
-        virtual void setSubtype(Uint16 subtype);
-
-        /**
-         * Sets the gender of this being.
-         */
-        virtual void setGender(Gender gender);
-
-        Gender getGender() const { return mGender; }
-
-        /**
-         * Whether or not this player is a GM.
-         */
-        bool isGM() const { return mIsGM; }
-
-        /**
-         * Triggers whether or not to show the name as a GM name.
-         */
-        virtual void setGM(bool gm);
-
-        /**
-         * Sets visible equipments for this player.
-         */
-        virtual void setSprite(int slot, int id,
-                               const std::string &color = "",
-                               bool isWeapon = false);
-
-        virtual void setSpriteID(unsigned int slot, int id);
-
-        virtual void setSpriteColor(unsigned int slot,
-                                    const std::string &color = "");
-
-        /**
-         * Adds a guild to the player.
-         */
-        void addGuild(Guild *guild);
-
-        /**
-         * Removers a guild from the player.
-         */
-        void removeGuild(int id);
-
-        /**
-         * Returns a pointer to the specified guild.
-         */
-        Guild *getGuild(const std::string &guildName) const;
-
-        /**
-         * Returns a pointer to the guild with matching id.
-         */
-        Guild *getGuild(int id) const;
-
-        /**
-         * Returns all guilds the player is in.
-         */
-        const std::map<int, Guild*> &getGuilds() const;
-
-        /**
-         * Removes all guilds the player is in.
-         */
-        void clearGuilds();
-
-        /**
-         * Get number of guilds the player belongs to.
-         */
-        short getNumberOfGuilds() const { return mGuilds.size(); }
-
-        bool isInParty() const { return mParty != NULL; }
-
-        void setParty(Party *party);
-
-        Party *getParty() const { return mParty; }
-
-        /**
-         * Gets the way the character is blocked by other objects.
-         */
-        virtual unsigned char getWalkMask() const
-        { return Map::BLOCKMASK_WALL | Map::BLOCKMASK_MONSTER; }
-
-        /**
-         * Called when a option (set with config.addListener()) is changed
-         */
-        virtual void optionChanged(const std::string &value);
-
-        /*
-         * Sets the IP or an IP hash.
-         * The TMW-Athena server sends this information only to GMs.
-         */
-        void setIp(int ip) { mIp = ip; }
-
-        /**
-         * Returns the player's IP or an IP hash.
-         * Value is 0 if not set by the server.
-         */
-        int getIp() const { return mIp; }
-
-    protected:
-        /**
-         * Gets the way the monster blocks pathfinding for other objects.
-         */
-        virtual Map::BlockType getBlockType() const
-        { return Map::BLOCKTYPE_CHARACTER; }
-
-        virtual void updateColors();
-
-        Gender mGender;
-        std::vector<int> mSpriteIDs;
-        std::vector<std::string> mSpriteColors;
-
-        // Character guild information
-        std::map<int, Guild*> mGuilds;
-        Party *mParty;
-
-        bool mIsGM;
-
-        int mIp;
-};
-
-#endif
diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp
new file mode 100644
index 00000000..1915822f
--- /dev/null
+++ b/src/playerinfo.cpp
@@ -0,0 +1,400 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "playerinfo.h"
+
+#include "client.h"
+#include "equipment.h"
+#include "event.h"
+#include "inventory.h"
+#include "listener.h"
+#include "log.h"
+
+#include "resources/iteminfo.h"
+
+namespace PlayerInfo {
+
+class PlayerLogic;
+
+PlayerLogic *mListener = 0;
+
+PlayerInfoBackend mData;
+
+Inventory *mInventory = 0;
+Equipment *mEquipment = 0;
+
+bool mStorageCount = 0;
+
+bool mNPCCount = 0;
+bool mNPCPostCount = 0;
+
+BuySellState mBuySellState = BUYSELL_NONE;
+bool mTrading = false;
+
+std::map<int, Special> mSpecials;
+char mSpecialRechargeUpdateNeeded = 0;
+
+int mLevelProgress = 0;
+
+// --- Triggers ---------------------------------------------------------------
+
+void triggerAttr(int id, int old)
+{
+    Mana::Event event(EVENT_UPDATEATTRIBUTE);
+    event.setInt("id", id);
+    event.setInt("oldValue", old);
+    event.setInt("newValue", mData.mAttributes.find(id)->second);
+    event.trigger(CHANNEL_ATTRIBUTES);
+}
+
+void triggerStat(int id, const std::string &changed, int old1, int old2 = 0)
+{
+    StatMap::iterator it = mData.mStats.find(id);
+    Mana::Event event(EVENT_UPDATESTAT);
+    event.setInt("id", id);
+    event.setInt("base", it->second.base);
+    event.setInt("mod", it->second.mod);
+    event.setInt("exp", it->second.exp);
+    event.setInt("expNeeded", it->second.expNeed);
+    event.setString("changed", changed);
+    event.setInt("oldValue1", old1);
+    event.setInt("oldValue2", old2);
+    event.trigger(CHANNEL_ATTRIBUTES);
+}
+
+// --- Attributes -------------------------------------------------------------
+
+int getAttribute(int id)
+{
+    IntMap::const_iterator it = mData.mAttributes.find(id);
+    if (it != mData.mAttributes.end())
+        return it->second;
+    else
+        return 0;
+}
+
+void setAttribute(int id, int value, bool notify)
+{
+    int old = mData.mAttributes[id];
+    mData.mAttributes[id] = value;
+    if (notify)
+        triggerAttr(id, old);
+}
+
+// --- Stats ------------------------------------------------------------------
+
+int getStatBase(int id)
+{
+    StatMap::const_iterator it = mData.mStats.find(id);
+    if (it != mData.mStats.end())
+        return it->second.base;
+    else
+        return 0;
+}
+
+void setStatBase(int id, int value, bool notify)
+{
+    int old = mData.mStats[id].base;
+    mData.mStats[id].base = value;
+    if (notify)
+        triggerStat(id, "base", old);
+}
+
+int getStatMod(int id)
+{
+    StatMap::const_iterator it = mData.mStats.find(id);
+    if (it != mData.mStats.end())
+        return it->second.mod;
+    else
+        return 0;
+}
+
+void setStatMod(int id, int value, bool notify)
+{
+    int old = mData.mStats[id].mod;
+    mData.mStats[id].mod = value;
+    if (notify)
+        triggerStat(id, "mod", old);
+}
+
+int getStatEffective(int id)
+{
+    StatMap::const_iterator it = mData.mStats.find(id);
+    if (it != mData.mStats.end())
+        return it->second.base + it->second.mod;
+    else
+        return 0;
+}
+
+std::pair<int, int> getStatExperience(int id)
+{
+    StatMap::const_iterator it = mData.mStats.find(id);
+    int a, b;
+    if (it != mData.mStats.end())
+    {
+        a = it->second.exp;
+        b = it->second.expNeed;
+    }
+    else
+    {
+        a = 0;
+        b = 0;
+    }
+    return std::pair<int, int>(a, b);
+}
+
+void setStatExperience(int id, int have, int need, bool notify)
+{
+    int oldExp = mData.mStats[id].exp;
+    int oldExpNeed = mData.mStats[id].expNeed;
+    mData.mStats[id].exp = have;
+    mData.mStats[id].expNeed = need;
+    if (notify)
+        triggerStat(id, "exp", oldExp, oldExpNeed);
+}
+
+// --- Inventory / Equipment --------------------------------------------------
+
+Inventory *getInventory()
+{
+    return mInventory;
+}
+
+void clearInventory()
+{
+    mEquipment->clear();
+    mInventory->clear();
+}
+
+void setInventoryItem(int index, int id, int amount)
+{
+    mInventory->setItem(index, id, amount);
+}
+
+Equipment *getEquipment()
+{
+    return mEquipment;
+}
+
+Item *getEquipment(unsigned int slot)
+{
+    return mEquipment->getEquipment(slot);
+}
+
+void setEquipmentBackend(Equipment::Backend *backend)
+{
+    mEquipment->setBackend(backend);
+}
+
+int getStorageCount()
+{
+    return mStorageCount;
+}
+
+void setStorageCount(int count)
+{
+    int old = mStorageCount;
+    mStorageCount = count;
+
+    if (count != old)
+    {
+        Mana::Event event(EVENT_STORAGECOUNT);
+        event.setInt("oldCount", old);
+        event.setInt("newCount", count);
+        event.trigger(CHANNEL_STORAGE);
+    }
+}
+
+// -- NPC ---------------------------------------------------------------------
+
+int getNPCInteractionCount()
+{
+    return mNPCCount;
+}
+
+void setNPCInteractionCount(int count)
+{
+    int old = mNPCCount;
+    mNPCCount = count;
+
+    if (count != old)
+    {
+        Mana::Event event(EVENT_NPCCOUNT);
+        event.setInt("oldCount", old);
+        event.setInt("newCount", count);
+        event.trigger(CHANNEL_NPC);
+    }
+}
+
+int getNPCPostCount()
+{
+    return mNPCPostCount;
+}
+
+void setNPCPostCount(int count)
+{
+    int old = mNPCPostCount;
+    mNPCPostCount = count;
+
+    if (count != old)
+    {
+        Mana::Event event(EVENT_POSTCOUNT);
+        event.setInt("oldCount", old);
+        event.setInt("newCount", count);
+        event.trigger(CHANNEL_NPC);
+    }
+}
+
+// -- Buy/Sell/Trade ----------------------------------------------------------
+
+BuySellState getBuySellState()
+{
+    return mBuySellState;
+}
+
+void setBuySellState(BuySellState buySellState)
+{
+    BuySellState old = mBuySellState;
+    mBuySellState = buySellState;
+
+    if (buySellState != old)
+    {
+        Mana::Event event(EVENT_STATECHANGE);
+        event.setInt("oldState", old);
+        event.setInt("newState", buySellState);
+        event.trigger(CHANNEL_BUYSELL);
+    }
+}
+
+bool isTrading()
+{
+    return mTrading;
+}
+
+void setTrading(bool trading)
+{
+    bool notify = mTrading != trading;
+    mTrading = trading;
+
+    if (notify)
+    {
+        Mana::Event event(EVENT_TRADING);
+        event.setBool("trading", trading);
+        event.trigger(CHANNEL_STATUS);
+    }
+}
+
+// --- Specials ---------------------------------------------------------------
+
+void setSpecialStatus(int id, int current, int max, int recharge)
+{
+    logger->log("SpecialUpdate Skill #%d -- (%d/%d) -> %d", id, current, max,
+                recharge);
+    mSpecials[id].currentMana = current;
+    mSpecials[id].neededMana = max;
+    mSpecials[id].recharge = recharge;
+}
+
+const SpecialsMap &getSpecialStatus()
+{
+    return mSpecials;
+}
+
+// --- Misc -------------------------------------------------------------------
+
+void setBackend(const PlayerInfoBackend &backend)
+{
+    mData = backend;
+}
+
+bool isTalking()
+{
+    return getNPCInteractionCount() || getNPCPostCount()
+            || getBuySellState() != BUYSELL_NONE;
+}
+
+void logic()
+{
+    if ((mSpecialRechargeUpdateNeeded%11) == 0)
+    {
+        mSpecialRechargeUpdateNeeded = 0;
+        for (SpecialsMap::iterator it = mSpecials.begin(),
+             it_end = mSpecials.end(); it != it_end; it++)
+        {
+            it->second.currentMana += it->second.recharge;
+            if (it->second.currentMana > it->second.neededMana)
+            {
+                it->second.currentMana = it->second.neededMana;
+            }
+        }
+    }
+    mSpecialRechargeUpdateNeeded++;
+}
+
+class PlayerLogic : Mana::Listener
+{
+public:
+    PlayerLogic()
+    {
+        listen(CHANNEL_CLIENT);
+        listen(CHANNEL_GAME);
+    }
+
+    void event(Channels channel, const Mana::Event &event)
+    {
+        if (channel == CHANNEL_CLIENT)
+        {
+            if (event.getName() == EVENT_STATECHANGE)
+            {
+                int newState = event.getInt("newState");
+
+                if (newState == STATE_GAME)
+                {
+                    if (mInventory == 0)
+                    {
+                        mInventory = new Inventory(Inventory::INVENTORY);
+                        mEquipment = new Equipment();
+                    }
+                }
+            }
+        }
+        else if (channel == CHANNEL_GAME)
+        {
+            if (event.getName() == EVENT_DESTRUCTED)
+            {
+                delete mInventory;
+                delete mEquipment;
+
+                mInventory = 0;
+                mEquipment = 0;
+            }
+        }
+    }
+};
+
+void init()
+{
+    if (mListener)
+        return;
+
+    mListener = new PlayerLogic();
+}
+
+} // namespace PlayerInfo
diff --git a/src/playerinfo.h b/src/playerinfo.h
new file mode 100644
index 00000000..43e7da6e
--- /dev/null
+++ b/src/playerinfo.h
@@ -0,0 +1,273 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PLAYERINFO_H
+#define PLAYERINFO_H
+
+#include <map>
+#include <string>
+
+/**
+ * Standard attributes for players.
+ */
+enum Attribute
+{
+    LEVEL,
+    HP, MAX_HP,
+    MP, MAX_MP,
+    EXP, EXP_NEEDED,
+    MONEY,
+    TOTAL_WEIGHT, MAX_WEIGHT,
+    SKILL_POINTS,
+    CHAR_POINTS, CORR_POINTS
+};
+
+/**
+ * Stat information storage structure.
+ */
+struct Stat
+{
+    int base;
+    int mod;
+    int exp;
+    int expNeed;
+};
+
+typedef std::map<int, int> IntMap;
+typedef std::map<int, Stat> StatMap;
+
+/**
+ * Backend for core player information.
+ */
+struct PlayerInfoBackend
+{
+    IntMap mAttributes;
+    StatMap mStats;
+};
+
+class Equipment;
+class Inventory;
+class Item;
+
+enum BuySellState
+{
+    BUYSELL_NONE,
+    BUYSELL_CHOOSING,
+    BUYSELL_BUYING,
+    BUYSELL_SELLING
+};
+
+/**
+ * Special information storage structure.
+ */
+struct Special
+{
+    int currentMana;
+    int neededMana;
+    int recharge;
+};
+
+typedef std::map<int, Special> SpecialsMap;
+
+/**
+ * A database like namespace which holds global info about the localplayer
+ *
+ * NOTE: 'bool notify' is used to determine if a event is to be triggered.
+ */
+namespace PlayerInfo
+{
+
+// --- Attributes -------------------------------------------------------------
+
+    /**
+     * Returns the value of the given attribute.
+     */
+    int getAttribute(int id);
+
+    /**
+     * Changes the value of the given attribute.
+     */
+    void setAttribute(int id, int value, bool notify = true);
+
+// --- Stats ------------------------------------------------------------------
+
+    /**
+     * Returns the base value of the given stat.
+     */
+    int getStatBase(int id);
+
+    /**
+     * Changes the base value of the given stat.
+     */
+    void setStatBase(int id, int value, bool notify = true);
+
+    /**
+     * Returns the modifier for the given stat.
+     */
+    int getStatMod(int id);
+
+    /**
+     * Changes the modifier for the given stat.
+     */
+    void setStatMod(int id, int value, bool notify = true);
+
+    /**
+     * Returns the current effective value of the given stat. Effective is base
+     * + mod
+     */
+    int getStatEffective(int id);
+
+    /**
+     * Changes the level of the given stat.
+     */
+    void setStatLevel(int id, int value, bool notify = true);
+
+    /**
+     * Returns the experience of the given stat.
+     */
+    std::pair<int, int> getStatExperience(int id);
+
+    /**
+     * Changes the experience of the given stat.
+     */
+    void setStatExperience(int id, int have, int need, bool notify = true);
+
+// --- Inventory / Equipment / Storage ----------------------------------------
+
+    /**
+     * Returns the player's inventory.
+     */
+    Inventory *getInventory();
+
+    /**
+     * Clears the player's inventory and equipment.
+     */
+    void clearInventory();
+
+    /**
+     * Changes the inventory item at the given slot.
+     */
+    void setInventoryItem(int index, int id, int amount);
+
+    /**
+     * Returns the player's equipment.
+     */
+    Equipment *getEquipment();
+
+    /**
+     * Returns the player's equipment at the given slot.
+     */
+    Item *getEquipment(unsigned int slot);
+
+    /**
+     * Returns the number of currently open storage windows.
+     */
+    int getStorageCount();
+
+    /**
+     * Sets the number of currently open storage windows.
+     */
+    void setStorageCount(int count);
+
+// -- NPC ---------------------------------------------------------------------
+
+    /**
+     * Returns the number of currently open NPC interaction windows.
+     */
+    int getNPCInteractionCount();
+
+    /**
+     * Sets the number of currently open NPC interaction windows.
+     */
+    void setNPCInteractionCount(int count);
+
+    /**
+     * Returns the number of currently open NPC post windows.
+     */
+    int getNPCPostCount();
+
+    /**
+     * Sets the number of currently open NPC post windows.
+     */
+    void setNPCPostCount(int count);
+
+// -- Buy/Sell/Trade ----------------------------------------------------------
+
+    /**
+     * Returns the current buy, sell, or related interaction the player is
+     * involved in.
+     */
+    BuySellState getBuySellState();
+
+    /**
+     * Sets which buy, sell, or related interaction the player is currently
+     * involved in.
+     */
+    void setBuySellState(BuySellState buySellState);
+
+    /**
+     * Returns true if the player is involved in a trade at the moment, false
+     * otherwise.
+     */
+    bool isTrading();
+
+    /**
+     * Sets whether the player is currently involved in trade or not.
+     */
+    void setTrading(bool trading);
+
+// --- Specials ---------------------------------------------------------------
+
+    /**
+     * Changes the status of the given special.
+     */
+    void setSpecialStatus(int id, int current, int max, int recharge);
+
+    /**
+     * Returns the status of the given special.
+     */
+    const SpecialsMap &getSpecialStatus();
+
+// --- Misc -------------------------------------------------------------------
+
+    /**
+     * Changes the internal PlayerInfoBackend reference;
+     */
+    void setBackend(const PlayerInfoBackend &backend);
+
+    /**
+     * Returns true if the player is involved in a NPC interaction, false
+     * otherwise.
+     */
+    bool isTalking();
+
+    /**
+     * Does necessary updates every tick.
+     */
+    void logic();
+
+    /**
+     * Initializes some internals.
+     */
+    void init();
+
+} // namespace PlayerInfo
+
+#endif
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp
index 14d9eb6b..8b6e6255 100644
--- a/src/playerrelations.cpp
+++ b/src/playerrelations.cpp
@@ -21,11 +21,10 @@
 
 #include <algorithm>
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
 #include "configuration.h"
 #include "graphics.h"
-#include "player.h"
 #include "playerrelations.h"
 
 #include "utils/dtor.h"
@@ -38,8 +37,6 @@
 #define NAME "name" // constant for xml serialisation
 #define RELATION "relation" // constant for xml serialisation
 
-#define IGNORE_EMOTE_TIME 100
-
 // (De)serialisation class
 class PlayerConfSerialiser : public ConfigurationListManager<std::pair<std::string, PlayerRelation *>,
                                                              std::map<std::string, PlayerRelation *> *>
@@ -214,7 +211,7 @@ unsigned int PlayerRelationsManager::checkPermissionSilently(const std::string &
 
 bool PlayerRelationsManager::hasPermission(Being *being, unsigned int flags)
 {
-    if (being->getType() == Being::PLAYER)
+    if (being->getType() == ActorSprite::PLAYER)
         return hasPermission(being->getName(), flags) == flags;
     return true;
 }
@@ -230,9 +227,10 @@ bool PlayerRelationsManager::hasPermission(const std::string &name,
         // execute `ignore' strategy, if possible
         if (mIgnoreStrategy)
         {
-            Being *b = beingManager->findBeingByName(name, Being::PLAYER);
-            if (b && b->getType() == Being::PLAYER)
-                mIgnoreStrategy->ignore(static_cast<Player *>(b), rejections);
+            Being *b = actorSpriteManager->findBeingByName(name,
+                                                        ActorSprite::PLAYER);
+            if (b && b->getType() == ActorSprite::PLAYER)
+                mIgnoreStrategy->ignore(b, rejections);
         }
     }
 
@@ -313,7 +311,7 @@ public:
         mShortName = PLAYER_IGNORE_STRATEGY_NOP;
     }
 
-    virtual void ignore(Player *player, unsigned int flags)
+    virtual void ignore(Being *being, unsigned int flags)
     {
     }
 };
@@ -327,9 +325,9 @@ public:
         mShortName = "dotdotdot";
     }
 
-    virtual void ignore(Player *player, unsigned int flags)
+    virtual void ignore(Being *being, unsigned int flags)
      {
-         player->setSpeech("...", 500);
+         being->setSpeech("...", 500);
      }
 };
 
@@ -343,44 +341,17 @@ public:
         mShortName = "blinkname";
     }
 
-    virtual void ignore(Player *player, unsigned int flags)
-    {
-        player->flashName(200);
-    }
-};
-
-class PIS_emote : public PlayerIgnoreStrategy
-{
-public:
-    PIS_emote(int emote_nr, const std::string &description, const std::string &shortname) :
-        mEmotion(emote_nr)
+    virtual void ignore(Being *being, unsigned int flags)
     {
-        mDescription = description;
-        mShortName = shortname;
+        being->flashName(200);
     }
-
-    virtual void ignore(Player *player, unsigned int flags)
-     {
-         player->setEmote(mEmotion, IGNORE_EMOTE_TIME);
-     }
-private:
-    int mEmotion;
 };
 
-
-
 std::vector<PlayerIgnoreStrategy *> *
 PlayerRelationsManager::getPlayerIgnoreStrategies()
 {
     if (mIgnoreStrategies.size() == 0)
     {
-        // not initialised yet?
-        mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE,
-                                                  _("Floating '...' bubble"),
-                                                   PLAYER_IGNORE_STRATEGY_EMOTE0));
-        mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE + 1,
-                                                  _("Floating bubble"),
-                                                  "emote1"));
         mIgnoreStrategies.push_back(new PIS_nothing());
         mIgnoreStrategies.push_back(new PIS_dotdotdot());
         mIgnoreStrategies.push_back(new PIS_blinkname());
diff --git a/src/playerrelations.h b/src/playerrelations.h
index 3ff1e5fd..d6ca31ad 100644
--- a/src/playerrelations.h
+++ b/src/playerrelations.h
@@ -28,7 +28,6 @@
 #include <vector>
 
 class Being;
-class Player;
 
 struct PlayerRelation
 {
@@ -73,7 +72,7 @@ public:
     /**
      * Handle the ignoring of the indicated action by the indicated player.
      */
-    virtual void ignore(Player *player, unsigned int flags) = 0;
+    virtual void ignore(Being *being, unsigned int flags) = 0;
 };
 
 class PlayerRelationsListener
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
new file mode 100644
index 00000000..e8824391
--- /dev/null
+++ b/src/resources/beinginfo.cpp
@@ -0,0 +1,107 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/beinginfo.h"
+
+#include "log.h"
+
+#include "utils/dtor.h"
+#include "utils/gettext.h"
+
+BeingInfo *BeingInfo::Unknown = new BeingInfo;
+
+BeingInfo::BeingInfo():
+        mName(_("unnamed")),
+        mTargetCursorSize(ActorSprite::TC_MEDIUM),
+        mWalkMask(Map::BLOCKMASK_WALL | Map::BLOCKMASK_CHARACTER
+                  | Map::BLOCKMASK_MONSTER),
+        mBlockType(Map::BLOCKTYPE_CHARACTER)
+{
+    SpriteDisplay display;
+    display.sprites.push_back(SpriteReference::Empty);
+
+    setDisplay(display);
+}
+
+BeingInfo::~BeingInfo()
+{
+    delete_all(mSounds);
+    delete_all(mAttacks);
+    mSounds.clear();
+}
+
+void BeingInfo::setDisplay(SpriteDisplay display)
+{
+    mDisplay = display;
+}
+
+void BeingInfo::setTargetCursorSize(const std::string &size)
+{
+    if (size == "small")
+        setTargetCursorSize(ActorSprite::TC_SMALL);
+    else if (size == "medium")
+        setTargetCursorSize(ActorSprite::TC_MEDIUM);
+    else if (size == "large")
+        setTargetCursorSize(ActorSprite::TC_LARGE);
+    else
+    {
+        logger->log("Unknown target cursor type \"%s\" for %s - using medium "
+                    "sized one", size.c_str(), getName().c_str());
+        setTargetCursorSize(ActorSprite::TC_MEDIUM);
+    }
+}
+
+void BeingInfo::addSound(SoundEvent event, const std::string &filename)
+{
+    if (mSounds.find(event) == mSounds.end())
+    {
+        mSounds[event] = new std::vector<std::string>;
+    }
+
+    mSounds[event]->push_back("sfx/" + filename);
+}
+
+const std::string &BeingInfo::getSound(SoundEvent event) const
+{
+    static std::string empty("");
+
+    SoundEvents::const_iterator i = mSounds.find(event);
+    return (i == mSounds.end()) ? empty :
+                                  i->second->at(rand() % i->second->size());
+}
+
+const Attack *BeingInfo::getAttack(int type) const
+{
+    static Attack *empty = new Attack(SpriteAction::ATTACK, "", "");
+
+    Attacks::const_iterator i = mAttacks.find(type);
+    return (i == mAttacks.end()) ? empty : (*i).second;
+}
+
+void BeingInfo::addAttack(int id, std::string action,
+                          const std::string &particleEffect,
+                          const std::string &missileParticle)
+{
+    if (mAttacks[id])
+        delete mAttacks[id];
+
+    mAttacks[id] = new Attack(action, particleEffect, missileParticle);
+}
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
new file mode 100644
index 00000000..52390976
--- /dev/null
+++ b/src/resources/beinginfo.h
@@ -0,0 +1,132 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef BEINGINFO_H
+#define BEINGINFO_H
+
+#include "actorsprite.h"
+
+#include "resources/spritedef.h"
+
+#include <list>
+#include <map>
+#include <string>
+#include <vector>
+
+struct Attack {
+    std::string action;
+    std::string particleEffect;
+    std::string missileParticle;
+
+    Attack(std::string action, std::string particleEffect,
+           std::string missileParticle)
+    {
+        this->action = action;
+        this->particleEffect = particleEffect;
+        this->missileParticle = missileParticle;
+    }
+};
+
+typedef std::map<int, Attack*> Attacks;
+
+enum SoundEvent
+{
+    SOUND_EVENT_HIT,
+    SOUND_EVENT_MISS,
+    SOUND_EVENT_HURT,
+    SOUND_EVENT_DIE
+};
+
+typedef std::map<SoundEvent, std::vector<std::string>* > SoundEvents;
+
+/**
+ * Holds information about a certain type of monster. This includes the name
+ * of the monster, the sprite to display and the sounds the monster makes.
+ *
+ * @see MonsterDB
+ * @see NPCDB
+ */
+class BeingInfo
+{
+    public:
+        static BeingInfo *Unknown;
+
+        BeingInfo();
+
+        ~BeingInfo();
+
+        void setName(const std::string &name) { mName = name; }
+
+        const std::string &getName() const
+        { return mName; }
+
+        void setDisplay(SpriteDisplay display);
+
+        const SpriteDisplay &getDisplay() const
+        { return mDisplay; }
+
+        void setTargetCursorSize(const std::string &size);
+
+        void setTargetCursorSize(ActorSprite::TargetCursorSize targetSize)
+        { mTargetCursorSize = targetSize; }
+
+        ActorSprite::TargetCursorSize getTargetCursorSize() const
+        { return mTargetCursorSize; }
+
+        void addSound(SoundEvent event, const std::string &filename);
+
+        const std::string &getSound(SoundEvent event) const;
+
+        void addAttack(int id, std::string action,
+                       const std::string &particleEffect,
+                       const std::string &missileParticle);
+
+        const Attack *getAttack(int type) const;
+
+        void setWalkMask(unsigned char mask)
+        { mWalkMask = mask; }
+
+        /**
+         * Gets the way the being is blocked by other objects
+         */
+        unsigned char getWalkMask() const
+        { return mWalkMask; }
+
+        void setBlockType(Map::BlockType blockType)
+        { mBlockType = blockType; }
+
+        Map::BlockType getBlockType() const
+        { return mBlockType; }
+
+    private:
+        SpriteDisplay mDisplay;
+        std::string mName;
+        ActorSprite::TargetCursorSize mTargetCursorSize;
+        SoundEvents mSounds;
+        Attacks mAttacks;
+        unsigned char mWalkMask;
+        Map::BlockType mBlockType;
+};
+
+typedef std::map<int, BeingInfo*> BeingInfos;
+typedef BeingInfos::iterator BeingInfoIterator;
+
+#endif // BEINGINFO_H
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index c24e760b..c542f7d0 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -20,16 +20,20 @@
 
 #include "resources/emotedb.h"
 
-#include "animatedsprite.h"
+#include "configuration.h"
 #include "log.h"
+#include "imagesprite.h"
+
+#include "resources/resourcemanager.h"
+#include "resources/image.h"
+#include "resources/imageset.h"
 
 #include "utils/xml.h"
-#include "configuration.h"
 
 namespace
 {
-    EmoteInfos mEmoteInfos;
-    EmoteInfo mUnknown;
+    Emotes mEmotes;
+    Emote mUnknown;
     bool mLoaded = false;
     int mLastEmote = 0;
 }
@@ -39,13 +43,12 @@ void EmoteDB::load()
     if (mLoaded)
         unload();
 
-    mLastEmote = 0;
+    mUnknown.name = "unknown";
+    mUnknown.effect = 0;
+    mUnknown.sprite = new ImageSprite(
+        ResourceManager::getInstance()->getImage("graphics/sprites/error.png"));
 
-    EmoteSprite *unknownSprite = new EmoteSprite;
-    unknownSprite->sprite = AnimatedSprite::load(
-                        paths.getValue("spriteErrorFile", "error.xml") );
-    unknownSprite->name = "unknown";
-    mUnknown.sprites.push_back(unknownSprite);
+    mLastEmote = 0;
 
     logger->log("Initializing emote database...");
 
@@ -71,28 +74,46 @@ void EmoteDB::load()
             continue;
         }
 
-        EmoteInfo *currentInfo = new EmoteInfo;
+        Emote *currentEmote = new Emote;
+
+        currentEmote->name = XML::getProperty(emoteNode, "name", "unknown");
+        currentEmote->effect = XML::getProperty(emoteNode, "effectid", -1);
+
+        if (currentEmote->effect == -1)
+        {
+            logger->log("Emote Database: Warning: Emote with no attached effect!");
+            delete currentEmote;
+            continue;
+        }
+
+        const std::string imageName = XML::getProperty(emoteNode, "image", "");
+        const int width = XML::getProperty(emoteNode, "width", 0);
+        const int height = XML::getProperty(emoteNode, "height", 0);
 
-        for_each_xml_child_node(spriteNode, emoteNode)
+        if (imageName.empty() || !(width > 0) || !(height > 0))
         {
-            if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
-            {
-                EmoteSprite *currentSprite = new EmoteSprite;
-                std::string file = paths.getValue("sprites",
-                                                  "graphics/sprites/")
-                                   + (std::string) (const char*)
-                                     spriteNode->xmlChildrenNode->content;
-                currentSprite->sprite = AnimatedSprite::load(file,
-                                XML::getProperty(spriteNode, "variant", 0));
-                currentInfo->sprites.push_back(currentSprite);
-            }
-            else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
-            {
-                std::string particlefx = (const char*) spriteNode->xmlChildrenNode->content;
-                currentInfo->particles.push_back(particlefx);
-            }
+            logger->log("Emote Database: Warning: Emote with bad imageset values");
+            delete currentEmote;
+            continue;
         }
-        mEmoteInfos[id] = currentInfo;
+
+        ImageSet *is = ResourceManager::getInstance()->getImageSet(imageName,
+                                                                   width,
+                                                                   height);
+        if (!is || !(is->size() > 0))
+        {
+            logger->log("Emote Database: Error loading imageset");
+            delete is;
+            delete currentEmote;
+            continue;
+        }
+        else
+        {
+            // For now we just use the first image in the animation
+            currentEmote->sprite = new ImageSprite(is->get(0));
+        }
+
+        mEmotes[id] = currentEmote;
         if (id > mLastEmote)
             mLastEmote = id;
     }
@@ -102,36 +123,22 @@ void EmoteDB::load()
 
 void EmoteDB::unload()
 {
-    for (EmoteInfos::const_iterator i = mEmoteInfos.begin();
-         i != mEmoteInfos.end();
-         i++)
+    Emotes::iterator i;
+    for (i = mEmotes.begin(); i != mEmotes.end(); i++)
     {
-        while (!i->second->sprites.empty())
-        {
-            delete i->second->sprites.front()->sprite;
-            delete i->second->sprites.front();
-            i->second->sprites.pop_front();
-        }
         delete i->second;
     }
 
-    mEmoteInfos.clear();
-
-    while (!mUnknown.sprites.empty())
-    {
-        delete mUnknown.sprites.front()->sprite;
-        delete mUnknown.sprites.front();
-        mUnknown.sprites.pop_front();
-    }
+    mEmotes.clear();
 
     mLoaded = false;
 }
 
-const EmoteInfo *EmoteDB::get(int id)
+const Emote *EmoteDB::get(int id)
 {
-    EmoteInfos::const_iterator i = mEmoteInfos.find(id);
+    Emotes::const_iterator i = mEmotes.find(id);
 
-    if (i == mEmoteInfos.end())
+    if (i == mEmotes.end())
     {
         logger->log("EmoteDB: Warning, unknown emote ID %d requested", id);
         return &mUnknown;
@@ -142,12 +149,6 @@ const EmoteInfo *EmoteDB::get(int id)
     }
 }
 
-const AnimatedSprite *EmoteDB::getAnimation(int id)
-{
-    const EmoteInfo *info = get(id);
-    return info->sprites.front()->sprite;
-}
-
 const int &EmoteDB::getLast()
 {
     return mLastEmote;
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 3d80ce8f..a2887a74 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -25,21 +25,16 @@
 #include <map>
 #include <string>
 
-class AnimatedSprite;
+class ImageSprite;
 
-struct EmoteSprite
+struct Emote
 {
-    const AnimatedSprite *sprite;
     std::string name;
+    ImageSprite *sprite;
+    int effect;
 };
 
-struct EmoteInfo
-{
-    std::list<EmoteSprite*> sprites;
-    std::list<std::string> particles;
-};
-
-typedef std::map<int, EmoteInfo*> EmoteInfos;
+typedef std::map<int, Emote*> Emotes;
 
 /**
  * Emote information database.
@@ -50,13 +45,11 @@ namespace EmoteDB
 
     void unload();
 
-    const EmoteInfo *get(int id);
-
-    const AnimatedSprite *getAnimation(int id);
+    const Emote *get(int id);
 
     const int &getLast();
 
-    typedef EmoteInfos::iterator EmoteInfosIterator;
+    typedef Emotes::iterator EmotesIterator;
 }
 
 #endif
diff --git a/src/resources/image.h b/src/resources/image.h
index 1db52ca0..9fdc0997 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -22,8 +22,6 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
-#include "main.h"
-
 #include "resources/resource.h"
 
 #include <SDL.h>
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index bd28cd6e..d33fac32 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -27,11 +27,11 @@
 
 #include "utils/dtor.h"
 
-ImageSet::ImageSet(Image *img, int width, int height)
+ImageSet::ImageSet(Image *img, int width, int height, int margin, int spacing)
 {
-    for (int y = 0; y + height <= img->getHeight(); y += height)
+    for (int y = margin; y + height <= img->getHeight() - margin; y += height + spacing)
     {
-        for (int x = 0; x + width <= img->getWidth(); x += width)
+        for (int x = margin; x + width <= img->getWidth() - margin; x += width + spacing)
         {
             mImages.push_back(img->getSubImage(x, y, width, height));
         }
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index 763b9880..3289788f 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -37,7 +37,7 @@ class ImageSet : public Resource
         /**
          * Cuts the passed image in a grid of sub images.
          */
-        ImageSet(Image *img, int w, int h);
+        ImageSet(Image *img, int w, int h, int margin = 0, int spacing = 0);
 
         /**
          * Destructor.
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index cb91e8d3..96cf8aef 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -23,6 +23,8 @@
 
 #include "log.h"
 
+#include "net/net.h"
+
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
 
@@ -36,29 +38,7 @@
 
 #include <cassert>
 
-namespace
-{
-    ItemDB::ItemInfos mItemInfos;
-    ItemDB::NamedItemInfos mNamedItemInfos;
-    ItemInfo *mUnknown;
-    bool mLoaded = false;
-}
-
-// Forward declarations
-static void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node);
-static void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node);
-
-static char const *const fields[][2] =
-{
-    { "attack",    N_("Attack %+d")    },
-    { "defense",   N_("Defense %+d")   },
-    { "hp",        N_("HP %+d")        },
-    { "mp",        N_("MP %+d")        }
-};
-
-static std::list<ItemDB::Stat> extraStats;
-
-void ItemDB::setStatsList(const std::list<ItemDB::Stat> &stats)
+void setStatsList(const std::list<ItemStat> &stats)
 {
     extraStats = stats;
 }
@@ -84,119 +64,172 @@ static ItemType itemTypeFromString(const std::string &name, int id = 0)
     else return ITEM_UNUSABLE;
 }
 
-static WeaponType weaponTypeFromString(const std::string &name, int id = 0)
+/*
+ * Common itemDB functions
+ */
+
+bool ItemDB::exists(int id)
 {
-    if      (name=="knife")      return WPNTYPE_KNIFE;
-    else if (name=="sword")      return WPNTYPE_SWORD;
-    else if (name=="polearm")    return WPNTYPE_POLEARM;
-    else if (name=="staff")      return WPNTYPE_STAFF;
-    else if (name=="whip")       return WPNTYPE_WHIP;
-    else if (name=="bow")        return WPNTYPE_BOW;
-    else if (name=="shooting")   return WPNTYPE_SHOOTING;
-    else if (name=="mace")       return WPNTYPE_MACE;
-    else if (name=="axe")        return WPNTYPE_AXE;
-    else if (name=="thrown")     return WPNTYPE_THROWN;
-
-    else return WPNTYPE_NONE;
+    assert(mLoaded);
+
+    ItemInfos::const_iterator i = mItemInfos.find(id);
+
+    return i != mItemInfos.end();
 }
 
-static std::string normalized(const std::string &name)
+const ItemInfo &ItemDB::get(int id)
 {
-    std::string normalized = name;
-    return toLower(trim(normalized));;
+    assert(mLoaded);
+
+    ItemInfos::const_iterator i = mItemInfos.find(id);
+
+    if (i == mItemInfos.end())
+    {
+        logger->log("ItemDB: Warning, unknown item ID# %d", id);
+        return *mUnknown;
+    }
+
+    return *(i->second);
 }
 
-void ItemDB::load()
+const ItemInfo &ItemDB::get(const std::string &name)
 {
-    if (mLoaded)
-        unload();
+    assert(mLoaded);
 
-    logger->log("Initializing item database...");
+    NamedItemInfos::const_iterator i = mNamedItemInfos.find(normalize(name));
 
-    mUnknown = new ItemInfo;
-    mUnknown->setName(_("Unknown item"));
-    mUnknown->setImageName("");
-    std::string errFile = paths.getValue("spriteErrorFile", "error.xml");
-    mUnknown->setSprite(errFile, GENDER_MALE);
-    mUnknown->setSprite(errFile, GENDER_FEMALE);
+    if (i == mNamedItemInfos.end())
+    {
+        if (!name.empty())
+        {
+            logger->log("ItemDB: Warning, unknown item name \"%s\"",
+                        name.c_str());
+        }
+        return *mUnknown;
+    }
 
-    XML::Document doc("items.xml");
-    xmlNodePtr rootNode = doc.rootNode();
+    return *(i->second);
+}
 
-    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items"))
+void ItemDB::loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node)
+{
+    std::string gender = XML::getProperty(node, "gender", "unisex");
+    std::string filename = (const char*) node->xmlChildrenNode->content;
+
+    if (gender == "male" || gender == "unisex")
+    {
+        itemInfo->setSprite(filename, GENDER_MALE);
+    }
+    if (gender == "female" || gender == "unisex")
+    {
+        itemInfo->setSprite(filename, GENDER_FEMALE);
+    }
+}
+
+void ItemDB::loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node)
+{
+    std::string event = XML::getProperty(node, "event", "");
+    std::string filename = (const char*) node->xmlChildrenNode->content;
+
+    if (event == "hit")
     {
-        logger->error("ItemDB: Error while loading items.xml!");
+        itemInfo->addSound(EQUIP_EVENT_HIT, filename);
     }
+    else if (event == "strike")
+    {
+        itemInfo->addSound(EQUIP_EVENT_STRIKE, filename);
+    }
+    else
+    {
+        logger->log("ItemDB: Ignoring unknown sound event '%s'",
+                event.c_str());
+    }
+}
 
-    for_each_xml_child_node(node, rootNode)
+void ItemDB::loadFloorSprite(SpriteDisplay *display, xmlNodePtr floorNode)
+{
+    for_each_xml_child_node(spriteNode, floorNode)
     {
+        if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
+        {
+            SpriteReference *currentSprite = new SpriteReference;
+            currentSprite->sprite = (const char*)spriteNode->xmlChildrenNode->content;
+            currentSprite->variant = XML::getProperty(spriteNode, "variant", 0);
+            display->sprites.push_back(currentSprite);
+        }
+        else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
+        {
+            std::string particlefx = (const char*)spriteNode->xmlChildrenNode->content;
+            display->particles.push_back(particlefx);
+        }
+    }
+}
+
+void ItemDB::unload()
+{
+    logger->log("Unloading item database...");
+
+    delete mUnknown;
+    mUnknown = NULL;
+
+    delete_all(mItemInfos);
+    mItemInfos.clear();
+    mNamedItemInfos.clear();
+    mLoaded = false;
+}
+
+void ItemDB::loadCommonRef(ItemInfo *itemInfo, xmlNodePtr node)
+{
         if (!xmlStrEqual(node->name, BAD_CAST "item"))
-            continue;
+            return;
 
         int id = XML::getProperty(node, "id", 0);
 
-        if (id == 0)
+        if (!id)
         {
-            logger->log("ItemDB: Invalid or missing item ID in items.xml!");
-            continue;
+            logger->log("ItemDB: Invalid or missing item Id in "
+                        ITEMS_DB_FILE "!");
+            return;
         }
         else if (mItemInfos.find(id) != mItemInfos.end())
-        {
-            logger->log("ItemDB: Redefinition of item ID %d", id);
-        }
+            logger->log("ItemDB: Redefinition of item Id %d", id);
 
-        std::string typeStr = XML::getProperty(node, "type", "other");
-        int weight = XML::getProperty(node, "weight", 0);
         int view = XML::getProperty(node, "view", 0);
 
         std::string name = XML::getProperty(node, "name", "");
         std::string image = XML::getProperty(node, "image", "");
         std::string description = XML::getProperty(node, "description", "");
-        int weaponType = weaponTypeFromString(XML::getProperty(node, "weapon-type", ""));
+        std::string attackAction = XML::getProperty(node, "attack-action", "");
         int attackRange = XML::getProperty(node, "attack-range", 0);
         std::string missileParticle = XML::getProperty(node, "missile-particle", "");
 
-        ItemInfo *itemInfo = new ItemInfo;
-        itemInfo->setId(id);
-        itemInfo->setImageName(image);
-        itemInfo->setName(name.empty() ? _("unnamed") : name);
-        itemInfo->setDescription(description);
-        itemInfo->setType(itemTypeFromString(typeStr));
-        itemInfo->setView(view);
-        itemInfo->setWeight(weight);
-        itemInfo->setWeaponType(weaponType);
-        itemInfo->setAttackRange(attackRange);
-        itemInfo->setMissileParticle(missileParticle);
+        // Load Ta Item Type
+        std::string typeStr = XML::getProperty(node, "type", "other");
+        itemInfo->mType = itemTypeFromString(typeStr);
 
-        std::string effect;
-        for (int i = 0; i < int(sizeof(fields) / sizeof(fields[0])); ++i)
-        {
-            int value = XML::getProperty(node, fields[i][0], 0);
-            if (!value) continue;
-            if (!effect.empty()) effect += " / ";
-            effect += strprintf(gettext(fields[i][1]), value);
-        }
-        for (std::list<Stat>::iterator it = extraStats.begin();
-                it != extraStats.end(); it++)
-        {
-            int value = XML::getProperty(node, it->tag.c_str(), 0);
-            if (!value) continue;
-            if (!effect.empty()) effect += " / ";
-            effect += strprintf(it->format.c_str(), value);
-        }
-        std::string temp = XML::getProperty(node, "effect", "");
-        if (!effect.empty() && !temp.empty())
-            effect += " / ";
-        effect += temp;
-        itemInfo->setEffect(effect);
+        int weight = XML::getProperty(node, "weight", 0);
+        itemInfo->mWeight = weight > 0 ? weight : 0;
+
+        SpriteDisplay display;
+        display.image = image;
+
+        itemInfo->mId = id;
+        itemInfo->mName = name;
+        itemInfo->mDescription = description;
+        itemInfo->mView = view;
+        itemInfo->mWeight = weight;
+        itemInfo->setAttackAction(attackAction);
+        itemInfo->mAttackRange = attackRange;
+        itemInfo->setMissileParticle(missileParticle);
 
+        // Load <sprite>, <sound>, and <floor>
         for_each_xml_child_node(itemChild, node)
         {
             if (xmlStrEqual(itemChild->name, BAD_CAST "sprite"))
             {
                 std::string attackParticle = XML::getProperty(
                     itemChild, "particle-effect", "");
-                itemInfo->setParticleEffect(attackParticle);
+                itemInfo->mParticle = attackParticle;
 
                 loadSpriteRef(itemInfo, itemChild);
             }
@@ -204,136 +237,306 @@ void ItemDB::load()
             {
                 loadSoundRef(itemInfo, itemChild);
             }
-        }
-
-        mItemInfos[id] = itemInfo;
-        if (!name.empty())
-        {
-            std::string temp = normalized(name);
-
-            NamedItemInfos::const_iterator itr = mNamedItemInfos.find(temp);
-            if (itr == mNamedItemInfos.end())
-            {
-                mNamedItemInfos[temp] = itemInfo;
-            }
-            else
+            else if (xmlStrEqual(itemChild->name, BAD_CAST "floor"))
             {
-                logger->log("ItemDB: Duplicate name of item found item %d", id);
+                loadFloorSprite(&display, itemChild);
             }
+
         }
 
-        if (weaponType > 0)
-            if (attackRange == 0)
-                logger->log("ItemDB: Missing attack range from weapon %i!", id);
+        // If the item has got a floor image, we bind the good reference.
+        itemInfo->mDisplay = display;
+}
 
-#define CHECK_PARAM(param, error_value) \
-        if (param == error_value) \
-            logger->log("ItemDB: Missing " #param " attribute for item %i!",id)
+void ItemDB::addItem(ItemInfo *itemInfo)
+{
+    std::string itemName = itemInfo->mName;
+    itemInfo->mName = itemName.empty() ? _("unnamed") : itemName;
+    mItemInfos[itemInfo->mId] = itemInfo;
+    if (!itemName.empty())
+    {
+        std::string temp = normalize(itemName);
 
-        if (id >= 0)
-        {
-            CHECK_PARAM(name, "");
-            CHECK_PARAM(description, "");
-            CHECK_PARAM(image, "");
-        }
-        // CHECK_PARAM(effect, "");
-        // CHECK_PARAM(type, 0);
-        // CHECK_PARAM(weight, 0);
-        // CHECK_PARAM(slot, 0);
+        NamedItemInfos::const_iterator itr = mNamedItemInfos.find(temp);
+        if (itr == mNamedItemInfos.end())
+            mNamedItemInfos[temp] = itemInfo;
+        else
+            logger->log("ItemDB: Duplicate name (%s) for item id %d found.",
+                        temp.c_str(), itemInfo->mId);
 
-#undef CHECK_PARAM
     }
-
-    mLoaded = true;
 }
 
-void ItemDB::unload()
+template <class T>
+static void checkParameter(int id, const T param, const T errorValue)
 {
-    logger->log("Unloading item database...");
+    if (param == errorValue)
+    {
+        std::stringstream errMsg;
+        errMsg << "ItemDB: Missing " << param << " attribute for item id "
+               << id << "!";
+        logger->log(errMsg.str().c_str());
+    }
+}
 
-    delete mUnknown;
-    mUnknown = NULL;
+void ItemDB::checkItemInfo(ItemInfo* itemInfo)
+{
+    int id = itemInfo->mId;
+    if (!itemInfo->getAttackAction().empty())
+        if (itemInfo->mAttackRange == 0)
+            logger->log("ItemDB: Missing attack range from weapon %i!", id);
 
-    delete_all(mItemInfos);
-    mItemInfos.clear();
-    mNamedItemInfos.clear();
-    mLoaded = false;
+    if (id >= 0)
+    {
+        checkParameter(id, itemInfo->mName, std::string());
+        checkParameter(id, itemInfo->mDescription, std::string());
+        checkParameter(id, itemInfo->mDisplay.image, std::string());
+        checkParameter(id, itemInfo->mWeight, 0);
+    }
 }
 
-bool ItemDB::exists(int id)
-{
-    assert(mLoaded);
+namespace TmwAthena {
 
-    ItemInfos::const_iterator i = mItemInfos.find(id);
+// Description fields used by TaItemDB *itemInfo->mEffect.
 
-    return i != mItemInfos.end();
-}
+static char const *const fields[][2] =
+{
+    { "attack",    N_("Attack %+d")    },
+    { "defense",   N_("Defense %+d")   },
+    { "hp",        N_("HP %+d")        },
+    { "mp",        N_("MP %+d")        }
+};
 
-const ItemInfo &ItemDB::get(int id)
+void TaItemDB::load()
 {
-    assert(mLoaded);
+    if (mLoaded)
+        unload();
 
-    ItemInfos::const_iterator i = mItemInfos.find(id);
+    logger->log("Initializing TmwAthena item database...");
 
-    if (i == mItemInfos.end())
+    mUnknown = new TaItemInfo;
+    mUnknown->mName = _("Unknown item");
+    mUnknown->mDisplay = SpriteDisplay();
+    std::string errFile = paths.getStringValue("spriteErrorFile");
+    mUnknown->setSprite(errFile, GENDER_MALE);
+    mUnknown->setSprite(errFile, GENDER_FEMALE);
+
+    XML::Document doc(ITEMS_DB_FILE);
+    xmlNodePtr rootNode = doc.rootNode();
+
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items"))
     {
-        logger->log("ItemDB: Warning, unknown item ID# %d", id);
-        return *mUnknown;
+        logger->error("ItemDB: Error while loading " ITEMS_DB_FILE "!");
+        return;
     }
 
-    return *(i->second);
-}
+    for_each_xml_child_node(node, rootNode)
+    {
+        TaItemInfo *itemInfo = new TaItemInfo;
 
-const ItemInfo &ItemDB::get(const std::string &name)
-{
-    assert(mLoaded);
+        loadCommonRef(itemInfo, node);
 
-    NamedItemInfos::const_iterator i = mNamedItemInfos.find(normalized(name));
+        // Everything not unusable or usable is equippable by the Ta type system.
+        itemInfo->mEquippable  = itemInfo->mType != ITEM_UNUSABLE
+                                 && itemInfo->mType != ITEM_USABLE;
 
-    if (i == mNamedItemInfos.end())
-    {
-        if (!name.empty())
+        // Load nano description
+        std::vector<std::string> effect;
+        for (int i = 0; i < int(sizeof(fields) / sizeof(fields[0])); ++i)
         {
-            logger->log("ItemDB: Warning, unknown item name \"%s\"",
-                        name.c_str());
+            int value = XML::getProperty(node, fields[i][0], 0);
+            if (!value)
+                continue;
+            effect.push_back(strprintf(gettext(fields[i][1]), value));
         }
-        return *mUnknown;
+        for (std::list<ItemStat>::iterator it = extraStats.begin();
+                it != extraStats.end(); it++)
+        {
+            int value = XML::getProperty(node, it->mTag.c_str(), 0);
+            if (!value)
+                continue;
+            effect.push_back(strprintf(it->mFormat.c_str(), value));
+        }
+        std::string temp = XML::getProperty(node, "effect", "");
+        if (!temp.empty())
+            effect.push_back(temp);
+
+        itemInfo->mEffect = effect;
+
+        checkItemInfo(itemInfo);
+
+        addItem(itemInfo);
     }
 
-    return *(i->second);
+    checkHairWeaponsRacesSpecialIds();
+
+    mLoaded = true;
 }
 
-void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node)
+void TaItemDB::checkItemInfo(ItemInfo* itemInfo)
 {
-    std::string gender = XML::getProperty(node, "gender", "unisex");
-    std::string filename = (const char*) node->xmlChildrenNode->content;
+    ItemDB::checkItemInfo(itemInfo);
 
-    if (gender == "male" || gender == "unisex")
-    {
-        itemInfo->setSprite(filename, GENDER_MALE);
-    }
-    if (gender == "female" || gender == "unisex")
+    // Check for unusable items?
+    //checkParameter(id, itemInfo->mType, 0);
+}
+
+}; // namespace TmwAthena
+
+namespace ManaServ {
+
+static std::map<std::string, const char* > triggerTable;
+
+static void initTriggerTable()
+{
+    if (triggerTable.empty())
     {
-        itemInfo->setSprite(filename, GENDER_FEMALE);
+        // FIXME: This should ideally be softcoded via XML or similar.
+        logger->log("Initializing ManaServ trigger table...");
+        triggerTable["existence"]       = " when it is in the inventory";
+        triggerTable["activation"]      = " upon activation";
+        triggerTable["equip"]           = " upon successful equip";
+        triggerTable["leave-inventory"] = " when it leaves the inventory";
+        triggerTable["unequip"]         = " when it is unequipped";
+        triggerTable["equip-change"]    = " when it changes the way it is equipped";
     }
 }
 
-void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node)
+void ManaServItemDB::load()
 {
-    std::string event = XML::getProperty(node, "event", "");
-    std::string filename = (const char*) node->xmlChildrenNode->content;
+    if (mLoaded)
+        unload();
 
-    if (event == "hit")
-    {
-        itemInfo->addSound(EQUIP_EVENT_HIT, filename);
-    }
-    else if (event == "strike")
+    // Initialize the trigger table for effect descriptions
+    initTriggerTable();
+
+    logger->log("Initializing ManaServ item database...");
+
+    mUnknown = new ManaServItemInfo;
+    mUnknown->mName = _("Unknown item");
+    mUnknown->mDisplay = SpriteDisplay();
+    std::string errFile = paths.getStringValue("spriteErrorFile");
+    mUnknown->setSprite(errFile, GENDER_MALE);
+    mUnknown->setSprite(errFile, GENDER_FEMALE);
+
+    XML::Document doc(ITEMS_DB_FILE);
+    xmlNodePtr rootNode = doc.rootNode();
+
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items"))
     {
-        itemInfo->addSound(EQUIP_EVENT_STRIKE, filename);
+        logger->log("ItemDB: Error while loading " ITEMS_DB_FILE "!");
+        return;
     }
-    else
+
+    for_each_xml_child_node(node, rootNode)
     {
-        logger->log("ItemDB: Ignoring unknown sound event '%s'",
-                event.c_str());
+        ManaServItemInfo *itemInfo = new ManaServItemInfo;
+
+        loadCommonRef(itemInfo, node);
+
+        // We default eqippable and activatable to false as their actual value will be set
+        // within the <equip> and <effect> sub-nodes..
+        itemInfo->mActivatable = false;
+        itemInfo->mEquippable = false;
+
+        // Load <equip>, and <effect> sub nodes.
+        std::vector<std::string> effect;
+        for_each_xml_child_node(itemChild, node)
+        {
+            if (xmlStrEqual(itemChild->name, BAD_CAST "equip"))
+            {
+                // The fact that there is a way to equip is enough.
+                // Discard any details, but mark the item as equippable.
+                itemInfo->mEquippable = true;
+            }
+            else if (xmlStrEqual(itemChild->name, BAD_CAST "effect"))
+            {
+                std::string trigger = XML::getProperty(
+                        itemChild, "trigger", "");
+                if (trigger.empty())
+                {
+                    logger->log("Found empty trigger effect label, skipping.");
+                    continue;
+                }
+
+                if (trigger == "activation")
+                    itemInfo->mActivatable = true;
+
+                std::map<std::string, const char* >::const_iterator triggerLabel =
+                        triggerTable.find(trigger);
+                if (triggerLabel == triggerTable.end())
+                {
+                    logger->log("Warning: unknown trigger %s in item %d!",
+                                trigger.c_str(), itemInfo->mId);
+                    continue;
+                }
+
+                for_each_xml_child_node(effectChild, itemChild)
+                {
+                    if (xmlStrEqual(effectChild->name, BAD_CAST "modifier"))
+                    {
+                        std::string attribute = XML::getProperty(
+                                effectChild, "attribute", "");
+                        double value = XML::getFloatProperty(
+                                effectChild, "value", 0.0);
+                        int duration = XML::getProperty(
+                                effectChild, "duration", 0);
+                        if (attribute.empty() || !value)
+                        {
+                            logger->log("Warning: incomplete modifier definition, skipping.");
+                            continue;
+                        }
+                        std::list<ItemStat>::const_iterator
+                                it = extraStats.begin(),
+                                it_end = extraStats.end();
+                        while (it != it_end && !(*it == attribute))
+                            ++it;
+                        if (it == extraStats.end())
+                        {
+                            logger->log("Warning: unknown modifier tag %s, skipping.", attribute.c_str());
+                            continue;
+                        }
+                        effect.push_back(
+                                strprintf(strprintf(
+                                        duration ?
+                                        strprintf("%%s%%s. This effect lasts %d ticks.", duration).c_str()
+                                        : "%s%s.", it->mFormat.c_str(), triggerLabel->second).c_str(), value));
+                    }
+                    else if (xmlStrEqual(effectChild->name, BAD_CAST "modifier"))
+                        effect.push_back(strprintf("Provides an autoattack%s.",
+                                                   triggerLabel->second));
+                    else if (xmlStrEqual(effectChild->name, BAD_CAST "consumes"))
+                        effect.push_back(strprintf("This will be consumed%s.",
+                                                   triggerLabel->second));
+                    else if (xmlStrEqual(effectChild->name, BAD_CAST "label"))
+                        effect.push_back(
+                                (const char*)effectChild->xmlChildrenNode->content);
+                }
+            }
+            // Set Item Type based on subnodes info
+            // TODO: Improve it once the itemTypes are loaded through xml
+            itemInfo->mType = ITEM_UNUSABLE;
+            if (itemInfo->mActivatable)
+                itemInfo->mType = ITEM_USABLE;
+            else if (itemInfo->mEquippable)
+                itemInfo->mType = ITEM_EQUIPMENT_TORSO;
+        } // end for_each_xml_child_node(itemChild, node)
+
+        itemInfo->mEffect = effect;
+
+        checkItemInfo(itemInfo);
+
+        addItem(itemInfo);
     }
+
+    mLoaded = true;
+}
+
+void ManaServItemDB::checkItemInfo(ItemInfo* itemInfo)
+{
+    ItemDB::checkItemInfo(itemInfo);
+
+    // Add specific Manaserv checks here
 }
+
+}; // namespace ManaServ
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index be023073..e80f2cd0 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -26,45 +26,185 @@
 #include <map>
 #include <string>
 
+#include "utils/xml.h"
+
+#define ITEMS_DB_FILE "items.xml"
+
 class ItemInfo;
+class SpriteDisplay;
+
+// Used to make the compiler uderstand the iteminfo friendship.
+namespace TmwAthena { class TaItemDB; };
+namespace ManaServ { class ManaServItemDB; };
 
 /**
- * Item information database.
+ * Nano-description functions
  */
-namespace ItemDB
+class ItemStat
 {
-    /**
-     * Loads the item data from <code>items.xml</code>.
-     */
-    void load();
+    friend class ItemDB;
+    friend class TmwAthena::TaItemDB;
+    friend class ManaServ::ManaServItemDB;
 
-    /**
-     * Frees item data.
-     */
-    void unload();
+    public:
+        ItemStat(const std::string &tag,
+             const std::string &format):
+        mTag(tag), mFormat(format) {}
 
-    bool exists(int id);
+        bool operator ==(std::string &name) const
+        { return mTag == name; }
 
-    const ItemInfo &get(int id);
-    const ItemInfo &get(const std::string &name);
+    private:
+        std::string mTag;
+        std::string mFormat;
+};
 
-    struct Stat
-    {
-        Stat(const std::string &tag,
-             const std::string &format):
-            tag(tag),
-            format(format)
+// Used to set nano-description
+static std::list<ItemStat> extraStats;
+void setStatsList(const std::list<ItemStat> &stats);
+
+/**
+ * Item information database generic definition.
+ */
+class ItemDB
+{
+    public:
+        ItemDB() :
+          mUnknown(0),
+          mLoaded(false)
+        {}
+
+        ~ItemDB()
+        {}
+
+        /**
+         * Loads the item data from <code>items.xml</code>.
+         */
+        virtual void load() = 0;
+
+        /**
+         * Frees item data.
+         */
+        virtual void unload();
+
+        /**
+         * Tells whether the item database is loaded.
+         */
+        bool isLoaded() const
+        { return mLoaded; }
+
+        bool exists(int id);
+
+        const ItemInfo &get(int id);
+        const ItemInfo &get(const std::string &name);
+
+    protected:
+        /**
+         * Permits to load item definitions which are common
+         * for each protocols to avoid code duplication.
+         */
+        void loadCommonRef(ItemInfo *itemInfo, xmlNodePtr node);
+
+        /**
+         * Checks the items parameters consistency.
+         */
+        virtual void checkItemInfo(ItemInfo* itemInfo);
+
+        /**
+         * Register the item to mItemInfos and mNamedItemsInfos
+         */
+        void addItem(ItemInfo *itemInfo);
+
+        // Default unknown reference
+        ItemInfo *mUnknown;
+
+        bool mLoaded;
+
+    private:
+        /**
+         * Loads the sprite references contained in a <sprite> tag.
+         */
+        void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node);
+
+        /**
+         * Loads the sound references contained in a <sound> tag.
+         */
+         void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node);
+
+        /**
+         * Loads the floor item references contained in a <floor> tag.
+         */
+        void loadFloorSprite(SpriteDisplay *display, xmlNodePtr node);
+
+        // Items database
+        typedef std::map<int, ItemInfo*> ItemInfos;
+        typedef std::map<std::string, ItemInfo*> NamedItemInfos;
+
+        ItemInfos mItemInfos;
+        NamedItemInfos mNamedItemInfos;
+};
+
+namespace TmwAthena {
+
+class TaItemInfo;
+
+/**
+ * Item information database TmwAthena specific class.
+ */
+class TaItemDB: public ItemDB
+{
+    public:
+        TaItemDB() : ItemDB()
+        { load(); }
+
+        ~TaItemDB()
+        { unload(); }
+
+        /**
+         * Loads the item data from <code>items.xml</code>.
+         */
+        void load();
+
+    private:
+        /**
+         * Check items id specific hard limits and log errors found.
+         * TODO: Do it.
+         */
+        void checkHairWeaponsRacesSpecialIds()
         {}
 
-        std::string tag;
-        std::string format;
-    };
+        void checkItemInfo(ItemInfo* itemInfo);
+};
+
+}; // namespace TmwAthena
+
+namespace ManaServ {
+
+class ManaServItemInfo;
+
+/**
+ * Item information database TmwAthena specific class.
+ */
+class ManaServItemDB: public ItemDB
+{
+    public:
+        ManaServItemDB() : ItemDB()
+        { load(); }
+
+        ~ManaServItemDB()
+        { unload(); }
+
+        /**
+         * Loads the item data from <code>items.xml</code>.
+         */
+        void load();
+
+    private:
+        void checkItemInfo(ItemInfo* itemInfo);
+};
 
-    void setStatsList(const std::list<Stat> &stats);
+}; // namespace ManaServ
 
-    // Items database
-    typedef std::map<int, ItemInfo*> ItemInfos;
-    typedef std::map<std::string, ItemInfo*> NamedItemInfos;
-}
+extern ItemDB *itemDb;
 
 #endif
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 4b1d82ea..32331e35 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -29,7 +29,7 @@ const std::string &ItemInfo::getSprite(Gender gender) const
     if (mView)
     {
         // Forward the request to the item defining how to view this item
-        return ItemDB::get(mView).getSprite(gender);
+        return itemDb->get(mView).getSprite(gender);
     }
     else
     {
@@ -41,35 +41,17 @@ const std::string &ItemInfo::getSprite(Gender gender) const
     }
 }
 
-void ItemInfo::setWeaponType(int type)
+void ItemInfo::setAttackAction(std::string attackAction)
 {
-    // See server item.hpp file for type values.
-    switch (type)
-    {
-        case WPNTYPE_NONE:
-            mAttackType = ACTION_DEFAULT;
-            break;
-        case WPNTYPE_KNIFE:
-        case WPNTYPE_SWORD:
-            mAttackType = ACTION_ATTACK_STAB;
-            break;
-        case WPNTYPE_THROWN:
-            mAttackType = ACTION_ATTACK_THROW;
-            break;
-        case WPNTYPE_BOW:
-            mAttackType = ACTION_ATTACK_BOW;
-            break;
-        case WPNTYPE_POLEARM:
-            mAttackType = ACTION_ATTACK_SWING;
-            break;
-        default:
-            mAttackType = ACTION_ATTACK;
-    }
+    if (attackAction.empty())
+        mAttackAction = SpriteAction::ATTACK; // (Equal to unarmed animation)
+    else
+        mAttackAction = attackAction;
 }
 
 void ItemInfo::addSound(EquipmentSoundEvent event, const std::string &filename)
 {
-    mSounds[event].push_back(paths.getValue("sfx", "sfx/") + filename);
+    mSounds[event].push_back(paths.getStringValue("sfx") + filename);
 }
 
 const std::string &ItemInfo::getSound(EquipmentSoundEvent event) const
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index a7c0ddca..50633f71 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -22,7 +22,7 @@
 #ifndef ITEMINFO_H
 #define ITEMINFO_H
 
-#include "player.h"
+#include "being.h"
 
 #include "resources/spritedef.h"
 
@@ -36,38 +36,9 @@ enum EquipmentSoundEvent
     EQUIP_EVENT_HIT
 };
 
-enum EquipmentSlot
-{
-    // Equipment rules:
-    // 1 Brest equipment
-    EQUIP_TORSO_SLOT = 0,
-    // 1 arms equipment
-    EQUIP_ARMS_SLOT = 1,
-    // 1 head equipment
-    EQUIP_HEAD_SLOT = 2,
-    // 1 legs equipment
-    EQUIP_LEGS_SLOT = 3,
-    // 1 feet equipment
-    EQUIP_FEET_SLOT = 4,
-    // 2 rings
-    EQUIP_RING1_SLOT = 5,
-    EQUIP_RING2_SLOT = 6,
-    // 1 necklace
-    EQUIP_NECKLACE_SLOT = 7,
-    // Fight:
-    //   2 one-handed weapons
-    //   or 1 two-handed weapon
-    //   or 1 one-handed weapon + 1 shield.
-    EQUIP_FIGHT1_SLOT = 8,
-    EQUIP_FIGHT2_SLOT = 9,
-    // Projectile:
-    //   this item does not amount to one, it only indicates the chosen projectile.
-    EQUIP_PROJECTILE_SLOT = 10
-};
-
-
 /**
  * Enumeration of available Item types.
+ * TODO: Dynamise this using an xml.
  */
 enum ItemType
 {
@@ -89,30 +60,21 @@ enum ItemType
     ITEM_SPRITE_HAIR // 15
 };
 
-/**
- * Enumeration of available weapon's types.
- */
-enum WeaponType
-{
-    WPNTYPE_NONE = 0,
-    WPNTYPE_KNIFE,
-    WPNTYPE_SWORD,
-    WPNTYPE_POLEARM,
-    WPNTYPE_STAFF,
-    WPNTYPE_WHIP,
-    WPNTYPE_BOW,
-    WPNTYPE_SHOOTING,
-    WPNTYPE_MACE,
-    WPNTYPE_AXE,
-    WPNTYPE_THROWN
-};
+// Used to make the compiler uderstand the iteminfo friendship.
+namespace TmwAthena { class TaItemDB; };
+namespace ManaServ { class ManaServItemDB; };
 
 /**
- * Defines a class for storing item infos. This includes information used when
- * the item is equipped.
+ * Defines a class for storing generic item infos.
+ * Specialized version for one or another protocol are defined below.
  */
 class ItemInfo
 {
+    friend class ItemDB;
+    friend void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node);
+    friend class TmwAthena::TaItemDB;
+    friend class ManaServ::ManaServItemDB;
+
     public:
         /**
          * Constructor.
@@ -122,98 +84,86 @@ class ItemInfo
             mWeight(0),
             mView(0),
             mId(0),
-            mAttackType(ACTION_DEFAULT)
+            mAttackAction(SpriteAction::INVALID)
         {
         }
 
-        void setId(int id)
-        { mId = id; }
-
         int getId() const
         { return mId; }
 
-        void setName(const std::string &name)
-        { mName = name; }
-
         const std::string &getName() const
         { return mName; }
 
-        void setParticleEffect(const std::string &particleEffect)
-        { mParticle = particleEffect; }
-
-        std::string getParticleEffect() const { return mParticle; }
+        std::string getParticleEffect() const
+        { return mParticle; }
 
-        void setImageName(const std::string &imageName)
-        { mImageName = imageName; }
-
-        const std::string &getImageName() const
-        { return mImageName; }
-
-        void setDescription(const std::string &description)
-        { mDescription = description; }
+        const SpriteDisplay &getDisplay() const
+        { return mDisplay; }
 
         const std::string &getDescription() const
         { return mDescription; }
 
-        void setEffect(const std::string &effect)
-        { mEffect = effect; }
-
-        const std::string &getEffect() const { return mEffect; }
-
-        void setType(ItemType type)
-        { mType = type; }
-
-        ItemType getType() const
-        { return mType; }
-
-        void setWeight(int weight)
-        { mWeight = weight; }
+        const std::vector<std::string> &getEffect() const
+        { return mEffect; }
 
         int getWeight() const
         { return mWeight; }
 
-        void setView(int view)
-        { mView = view; }
-
-        void setSprite(const std::string &animationFile, Gender gender)
-        { mAnimationFiles[gender] = animationFile; }
-
         const std::string &getSprite(Gender gender) const;
 
-        void setWeaponType(int);
+        void setAttackAction(std::string attackAction);
 
         // Handlers for seting and getting the string used for particles when attacking
-        void setMissileParticle(std::string s) { mMissileParticle = s; }
+        void setMissileParticle(std::string s)
+        { mMissileParticle = s; }
 
-        std::string getMissileParticle() const { return mMissileParticle; }
+        std::string getMissileParticle() const
+        { return mMissileParticle; }
 
-        SpriteAction getAttackType() const
-        { return mAttackType; }
+        std::string getAttackAction() const
+        { return mAttackAction; }
 
         int getAttackRange() const
         { return mAttackRange; }
 
-        void setAttackRange(int r)
-        { mAttackRange = r; }
+        const std::string &getSound(EquipmentSoundEvent event) const;
 
-        void addSound(EquipmentSoundEvent event, const std::string &filename);
+        bool getEquippable() const
+        { return mEquippable; }
 
-        const std::string &getSound(EquipmentSoundEvent event) const;
+        bool getActivatable() const
+        { return mActivatable; }
+
+        ItemType getItemType() const
+        { return mType; }
+
+    private:
+
+        void setSprite(const std::string &animationFile, Gender gender)
+        { mAnimationFiles[gender] = animationFile; }
+
+        void addSound(EquipmentSoundEvent event, const std::string &filename);
 
-    protected:
-        std::string mImageName;      /**< The filename of the icon image. */
+        SpriteDisplay mDisplay;           /**< Display info (like icon) */
         std::string mName;
-        std::string mDescription;    /**< Short description. */
-        std::string mEffect;         /**< Description of effects. */
-        ItemType mType;              /**< Item type. */
-        std::string mParticle;       /**< Particle effect used with this item */
-        int mWeight;                 /**< Weight in grams. */
-        int mView;                   /**< Item ID of how this item looks. */
-        int mId;                     /**< Item ID */
-
-        // Equipment related members
-        SpriteAction mAttackType;    /**< Attack type, in case of weapon. */
-        int mAttackRange;            /**< Attack range, will be zero if non weapon. */
+        std::string mDescription;         /**< Short description. */
+        std::vector<std::string> mEffect; /**< Description of effects. */
+        ItemType mType;                   /**< Item type. */
+        std::string mParticle;            /**< Particle effect used with this item */
+        int mWeight;                      /**< Weight in grams. */
+        int mView;                        /**< Item ID of how this item looks. */
+        int mId;                          /**< Item ID */
+
+        bool mEquippable;                 /**< Whether this item can be equipped. */
+        bool mActivatable;                /**< Whether this item can be activated. */
+
+        // Equipment related members.
+        /** Attack type, in case of weapon.
+         * See SpriteAction in spritedef.h for more info.
+         * Attack action sub-types (bow, sword, ...) are defined in items.xml.
+         */
+        std::string mAttackAction;
+        int mAttackRange;      /**< Attack range, will be zero if non weapon. */
 
         // Particle to be shown when weapon attacks
         std::string mMissileParticle;
@@ -225,4 +175,80 @@ class ItemInfo
         std::map< EquipmentSoundEvent, std::vector<std::string> > mSounds;
 };
 
+/*
+ * TmwAthena specialization of the itemInfo for TmwAthena
+ */
+namespace TmwAthena {
+
+enum EquipmentSlot
+{
+    // Equipment rules:
+    // 1 Brest equipment
+    EQUIP_TORSO_SLOT = 0,
+    // 1 arms equipment
+    EQUIP_ARMS_SLOT = 1,
+    // 1 head equipment
+    EQUIP_HEAD_SLOT = 2,
+    // 1 legs equipment
+    EQUIP_LEGS_SLOT = 3,
+    // 1 feet equipment
+    EQUIP_FEET_SLOT = 4,
+    // 2 rings
+    EQUIP_RING1_SLOT = 5,
+    EQUIP_RING2_SLOT = 6,
+    // 1 necklace
+    EQUIP_NECKLACE_SLOT = 7,
+    // Fight:
+    //   2 one-handed weapons
+    //   or 1 two-handed weapon
+    //   or 1 one-handed weapon + 1 shield.
+    EQUIP_FIGHT1_SLOT = 8,
+    EQUIP_FIGHT2_SLOT = 9,
+    // Projectile:
+    //   this item does not amount to one, it only indicates the chosen projectile.
+    EQUIP_PROJECTILE_SLOT = 10,
+    EQUIP_VECTOR_END = 11
+};
+
+/**
+ * Defines a class for storing TmwAthena specific item infos.
+ * Specialized version for one or another protocol are defined below.
+ */
+class TaItemInfo: public ItemInfo
+{
+    friend class TaItemDB;
+
+    public:
+        /**
+         * Constructor.
+         */
+        TaItemInfo():ItemInfo()
+        {}
+
+        // Declare TmwAthena Specific item info here
+};
+
+}; // namespace TmwAthena
+
+namespace ManaServ {
+
+/**
+ * Defines a class for storing Manaserv Specific item infos.
+ * Specialized version for one or another protocol are defined below.
+ */
+class ManaServItemInfo: public ItemInfo
+{
+    public:
+        /**
+         * Constructor.
+         */
+        ManaServItemInfo():ItemInfo()
+        {}
+
+        // Declare Manaserv Specific item info here
+};
+
+
+}; // namespace ManaServ
+
 #endif
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index c866c680..1dd12723 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -185,11 +185,9 @@ Map *MapReader::readMap(xmlNodePtr node, const std::string &path)
                         if (config.getValue("showWarps", 1))
                         {
                             map->addParticleEffect(
-                            paths.getValue("particles",
-                                           "graphics/particles/")
-                            + paths.getValue("portalEffectFile",
-                                             "warparea.particle.xml"),
-                                objX, objY, objW, objH);
+                                     paths.getStringValue("particles")
+                                     + paths.getStringValue("portalEffectFile"),
+                                                   objX, objY, objW, objH);
                         }
                     }
                     else
@@ -429,6 +427,8 @@ Tileset *MapReader::readTileset(xmlNodePtr node, const std::string &path,
                                 Map *map)
 {
     int firstGid = XML::getProperty(node, "firstgid", 0);
+    int margin = XML::getProperty(node, "margin", 0);
+    int spacing = XML::getProperty(node, "spacing", 0);
     XML::Document* doc = NULL;
     Tileset *set = NULL;
     std::string pathDir(path);
@@ -463,7 +463,8 @@ Tileset *MapReader::readTileset(xmlNodePtr node, const std::string &path,
 
                 if (tilebmp)
                 {
-                    set = new Tileset(tilebmp, tw, th, firstGid);
+                    set = new Tileset(tilebmp, tw, th, firstGid, margin,
+                                      spacing);
                     tilebmp->decRef();
                 }
                 else
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index b08d87f2..6bc64a89 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -23,21 +23,21 @@
 
 #include "log.h"
 
-#include "resources/monsterinfo.h"
+#include "net/net.h"
+
+#include "resources/beinginfo.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 #include "utils/xml.h"
 
-#include "net/net.h"
 #include "configuration.h"
 
 #define OLD_TMWATHENA_OFFSET 1002
 
 namespace
 {
-    MonsterDB::MonsterInfos mMonsterInfos;
-    MonsterInfo mUnknown;
+    BeingInfos mMonsterInfos;
     bool mLoaded = false;
 }
 
@@ -46,8 +46,6 @@ void MonsterDB::load()
     if (mLoaded)
         unload();
 
-    mUnknown.addSprite(paths.getValue("spriteErrorFile", "error.xml"));
-
     logger->log("Initializing monster database...");
 
     XML::Document doc("monsters.xml");
@@ -69,39 +67,29 @@ void MonsterDB::load()
             continue;
         }
 
-        MonsterInfo *currentInfo = new MonsterInfo;
+        BeingInfo *currentInfo = new BeingInfo;
+
+        currentInfo->setWalkMask(Map::BLOCKMASK_WALL
+                                 | Map::BLOCKMASK_CHARACTER
+                                 | Map::BLOCKMASK_MONSTER);
+        currentInfo->setBlockType(Map::BLOCKTYPE_MONSTER);
 
         currentInfo->setName(XML::getProperty(monsterNode, "name", _("unnamed")));
 
-        std::string targetCursor;
-        targetCursor = XML::getProperty(monsterNode, "targetCursor", "medium");
-        if (targetCursor == "small")
-        {
-            currentInfo->setTargetCursorSize(Being::TC_SMALL);
-        }
-        else if (targetCursor == "medium")
-        {
-            currentInfo->setTargetCursorSize(Being::TC_MEDIUM);
-        }
-        else if (targetCursor == "large")
-        {
-            currentInfo->setTargetCursorSize(Being::TC_LARGE);
-        }
-        else
-        {
-            logger->log("MonsterDB: Unknown target cursor type \"%s\" for %s -"
-                        "using medium sized one",
-                        targetCursor.c_str(), currentInfo->getName().c_str());
-            currentInfo->setTargetCursorSize(Being::TC_MEDIUM);
-        }
+        currentInfo->setTargetCursorSize(XML::getProperty(monsterNode,
+                                         "targetCursor", "medium"));
+
+        SpriteDisplay display;
 
         //iterate <sprite>s and <sound>s
         for_each_xml_child_node(spriteNode, monsterNode)
         {
             if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
             {
-                currentInfo->addSprite(
-                        (const char*) spriteNode->xmlChildrenNode->content);
+                SpriteReference *currentSprite = new SpriteReference;
+                currentSprite->sprite = (const char*)spriteNode->xmlChildrenNode->content;
+                currentSprite->variant = XML::getProperty(spriteNode, "variant", 0);
+                display.sprites.push_back(currentSprite);
             }
             else if (xmlStrEqual(spriteNode->name, BAD_CAST "sound"))
             {
@@ -111,19 +99,19 @@ void MonsterDB::load()
 
                 if (event == "hit")
                 {
-                    currentInfo->addSound(MONSTER_EVENT_HIT, filename);
+                    currentInfo->addSound(SOUND_EVENT_HIT, filename);
                 }
                 else if (event == "miss")
                 {
-                    currentInfo->addSound(MONSTER_EVENT_MISS, filename);
+                    currentInfo->addSound(SOUND_EVENT_MISS, filename);
                 }
                 else if (event == "hurt")
                 {
-                    currentInfo->addSound(MONSTER_EVENT_HURT, filename);
+                    currentInfo->addSound(SOUND_EVENT_HURT, filename);
                 }
                 else if (event == "die")
                 {
-                    currentInfo->addSound(MONSTER_EVENT_DIE, filename);
+                    currentInfo->addSound(SOUND_EVENT_DIE, filename);
                 }
                 else
                 {
@@ -138,18 +126,22 @@ void MonsterDB::load()
                 const int id = XML::getProperty(spriteNode, "id", 0);
                 const std::string particleEffect = XML::getProperty(
                         spriteNode, "particle-effect", "");
-                SpriteAction spriteAction = SpriteDef::makeSpriteAction(
-                        XML::getProperty(spriteNode, "action", "attack"));
+                const std::string spriteAction = XML::getProperty(spriteNode,
+                                                                  "action",
+                                                                  "attack");
                 const std::string missileParticle = XML::getProperty(
                         spriteNode, "missile-particle", "");
-                currentInfo->addMonsterAttack(id, particleEffect, spriteAction, missileParticle);
+                currentInfo->addAttack(id, spriteAction,
+                                       particleEffect, missileParticle);
             }
             else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
             {
-                currentInfo->addParticleEffect(
+                display.particles.push_back(
                     (const char*) spriteNode->xmlChildrenNode->content);
             }
         }
+        currentInfo->setDisplay(display);
+
         mMonsterInfos[XML::getProperty(monsterNode, "id", 0) + offset] = currentInfo;
     }
 
@@ -165,17 +157,17 @@ void MonsterDB::unload()
 }
 
 
-const MonsterInfo &MonsterDB::get(int id)
+BeingInfo *MonsterDB::get(int id)
 {
-    MonsterInfoIterator i = mMonsterInfos.find(id);
+    BeingInfoIterator i = mMonsterInfos.find(id);
 
     if (i == mMonsterInfos.end())
     {
         logger->log("MonsterDB: Warning, unknown monster ID %d requested", id);
-        return mUnknown;
+        return BeingInfo::Unknown;
     }
     else
     {
-        return *(i->second);
+        return i->second;
     }
 }
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 0fc8d2cf..50f70438 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -22,9 +22,7 @@
 #ifndef MONSTER_DB_H
 #define MONSTER_DB_H
 
-#include <map>
-
-class MonsterInfo;
+class BeingInfo;
 
 /**
  * Monster information database.
@@ -35,10 +33,7 @@ namespace MonsterDB
 
     void unload();
 
-    const MonsterInfo &get(int id);
-
-    typedef std::map<int, MonsterInfo*> MonsterInfos;
-    typedef MonsterInfos::iterator MonsterInfoIterator;
+    BeingInfo *get(int id);
 }
 
 #endif
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
deleted file mode 100644
index 12cdbe3e..00000000
--- a/src/resources/monsterinfo.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "resources/monsterinfo.h"
-
-#include "utils/dtor.h"
-#include "utils/gettext.h"
-#include "configuration.h"
-
-MonsterInfo::MonsterInfo():
-        mName(_("unnamed")),
-        mTargetCursorSize(Being::TC_MEDIUM)
-{
-}
-
-MonsterInfo::~MonsterInfo()
-{
-    // kill vectors in mSoundEffects
-    delete_all(mSounds);
-    delete_all(mMonsterAttacks);
-    mSounds.clear();
-}
-
-void MonsterInfo::addSound(MonsterSoundEvent event, const std::string &filename)
-{
-    if (mSounds.find(event) == mSounds.end())
-    {
-        mSounds[event] = new std::vector<std::string>;
-    }
-
-    mSounds[event]->push_back(paths.getValue("sfx", "sfx/")
-                              + filename);
-}
-
-const std::string &MonsterInfo::getSound(MonsterSoundEvent event) const
-{
-    static std::string empty("");
-    std::map<MonsterSoundEvent, std::vector<std::string>* >::const_iterator i =
-        mSounds.find(event);
-    return (i == mSounds.end()) ? empty :
-                                  i->second->at(rand() % i->second->size());
-}
-
-const std::string &MonsterInfo::getAttackParticleEffect(int attackType) const
-{
-    static std::string empty("");
-    std::map<int, MonsterAttack*>::const_iterator i =
-        mMonsterAttacks.find(attackType);
-    return (i == mMonsterAttacks.end()) ? empty : (*i).second->particleEffect;
-}
-
-const std::string &MonsterInfo::getAttackMissileParticle(int attackType) const
-{
-    static std::string empty("");
-    std::map<int, MonsterAttack*>::const_iterator i =
-        mMonsterAttacks.find(attackType);
-    return (i == mMonsterAttacks.end()) ? empty : (*i).second->missileParticle;
-}
-
-SpriteAction MonsterInfo::getAttackAction(int attackType) const
-{
-    std::map<int, MonsterAttack*>::const_iterator i =
-        mMonsterAttacks.find(attackType);
-    return (i == mMonsterAttacks.end()) ? ACTION_ATTACK : (*i).second->action;
-}
-
-void MonsterInfo::addMonsterAttack(int id,
-                                   const std::string &particleEffect,
-                                   SpriteAction action,
-                                   const std::string &missileParticle)
-{
-    MonsterAttack *a = new MonsterAttack;
-    a->particleEffect = particleEffect;
-    a->missileParticle = missileParticle;
-    a->action = action;
-    mMonsterAttacks[id] = a;
-}
-
-void MonsterInfo::addParticleEffect(const std::string &filename)
-{
-    mParticleEffects.push_back(filename);
-}
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
deleted file mode 100644
index f074254a..00000000
--- a/src/resources/monsterinfo.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MONSTERINFO_H
-#define MONSTERINFO_H
-
-#include "being.h"
-
-#include <list>
-#include <map>
-#include <string>
-#include <vector>
-
-enum MonsterSoundEvent
-{
-    MONSTER_EVENT_HIT,
-    MONSTER_EVENT_MISS,
-    MONSTER_EVENT_HURT,
-    MONSTER_EVENT_DIE
-};
-
-struct MonsterAttack
-{
-    std::string missileParticle;
-    std::string particleEffect;
-    SpriteAction action;
-};
-
-/**
- * Holds information about a certain type of monster. This includes the name
- * of the monster, the sprite to display and the sounds the monster makes.
- *
- * @see MonsterDB
- */
-class MonsterInfo
-{
-    public:
-        MonsterInfo();
-
-        ~MonsterInfo();
-
-        void setName(const std::string &name) { mName = name; }
-
-        void addSprite(const std::string &filename)
-        { mSprites.push_back(filename); }
-
-        void setTargetCursorSize(Being::TargetCursorSize targetCursorSize)
-        { mTargetCursorSize = targetCursorSize; }
-
-        void addSound(MonsterSoundEvent event, const std::string &filename);
-
-        void addParticleEffect(const std::string &filename);
-
-        const std::string &getName() const
-        { return mName; }
-
-        const std::list<std::string>& getSprites() const
-        { return mSprites; }
-
-        Being::TargetCursorSize getTargetCursorSize() const
-        { return mTargetCursorSize; }
-
-        const std::string &getSound(MonsterSoundEvent event) const;
-
-        void addMonsterAttack(int id,
-                              const std::string &particleEffect,
-                              SpriteAction action,
-                              const std::string &missileParticle);
-
-        const std::string &getAttackParticleEffect(int attackType) const;
-
-        const std::string &getAttackMissileParticle(int attackType) const;
-
-        SpriteAction getAttackAction(int attackType) const;
-
-        const std::list<std::string>& getParticleEffects() const
-        { return mParticleEffects; }
-
-    private:
-        std::string mName;
-        std::list<std::string> mSprites;
-        Being::TargetCursorSize mTargetCursorSize;
-        std::map<MonsterSoundEvent, std::vector<std::string>* > mSounds;
-        std::map<int, MonsterAttack*> mMonsterAttacks;
-        std::list<std::string> mParticleEffects;
-};
-
-#endif // MONSTERINFO_H
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 21a2e9a1..ec22c225 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -23,13 +23,15 @@
 
 #include "log.h"
 
+#include "resources/beinginfo.h"
+
+#include "utils/dtor.h"
 #include "utils/xml.h"
 #include "configuration.h"
 
 namespace
 {
-    NPCInfos mNPCInfos;
-    NPCInfo mUnknown;
+    BeingInfos mNPCInfos;
     bool mLoaded = false;
 }
 
@@ -38,12 +40,6 @@ void NPCDB::load()
     if (mLoaded)
         unload();
 
-    NPCsprite *unknownSprite = new NPCsprite;
-    unknownSprite->sprite = paths.getValue("spriteErrorFile",
-                                           "error.xml");
-    unknownSprite->variant = 0;
-    mUnknown.sprites.push_back(unknownSprite);
-
     logger->log("Initializing NPC database...");
 
     XML::Document doc("npcs.xml");
@@ -67,23 +63,30 @@ void NPCDB::load()
             continue;
         }
 
-        NPCInfo *currentInfo = new NPCInfo;
+        BeingInfo *currentInfo = new BeingInfo;
 
+        currentInfo->setTargetCursorSize(XML::getProperty(npcNode,
+                                         "targetCursor", "medium"));
+
+        SpriteDisplay display;
         for_each_xml_child_node(spriteNode, npcNode)
         {
             if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
             {
-                NPCsprite *currentSprite = new NPCsprite;
+                SpriteReference *currentSprite = new SpriteReference;
                 currentSprite->sprite = (const char*)spriteNode->xmlChildrenNode->content;
                 currentSprite->variant = XML::getProperty(spriteNode, "variant", 0);
-                currentInfo->sprites.push_back(currentSprite);
+                display.sprites.push_back(currentSprite);
             }
             else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
             {
                 std::string particlefx = (const char*)spriteNode->xmlChildrenNode->content;
-                currentInfo->particles.push_back(particlefx);
+                display.particles.push_back(particlefx);
             }
         }
+
+        currentInfo->setDisplay(display);
+
         mNPCInfos[id] = currentInfo;
     }
 
@@ -92,40 +95,23 @@ void NPCDB::load()
 
 void NPCDB::unload()
 {
-    for (   NPCInfosIterator i = mNPCInfos.begin();
-            i != mNPCInfos.end();
-            i++)
-    {
-        while (!i->second->sprites.empty())
-        {
-            delete i->second->sprites.front();
-            i->second->sprites.pop_front();
-        }
-        delete i->second;
-    }
-
+    delete_all(mNPCInfos);
     mNPCInfos.clear();
 
-    while (!mUnknown.sprites.empty())
-    {
-        delete mUnknown.sprites.front();
-        mUnknown.sprites.pop_front();
-    }
-
     mLoaded = false;
 }
 
-const NPCInfo& NPCDB::get(int id)
+BeingInfo *NPCDB::get(int id)
 {
-    NPCInfosIterator i = mNPCInfos.find(id);
+    BeingInfoIterator i = mNPCInfos.find(id);
 
     if (i == mNPCInfos.end())
     {
         logger->log("NPCDB: Warning, unknown NPC ID %d requested", id);
-        return mUnknown;
+        return BeingInfo::Unknown;
     }
     else
     {
-        return *(i->second);
+        return i->second;
     }
 }
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index 9da873e4..b0c89c80 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -22,23 +22,7 @@
 #ifndef NPC_DB_H
 #define NPC_DB_H
 
-#include <list>
-#include <map>
-#include <string>
-
-struct NPCsprite
-{
-    std::string sprite;
-    int variant;
-};
-
-struct NPCInfo
-{
-    std::list<NPCsprite*> sprites;
-    std::list<std::string> particles;
-};
-
-typedef std::map<int, NPCInfo*> NPCInfos;
+class BeingInfo;
 
 /**
  * NPC information database.
@@ -49,9 +33,7 @@ namespace NPCDB
 
     void unload();
 
-    const NPCInfo& get(int id);
-
-    typedef NPCInfos::iterator NPCInfosIterator;
+    BeingInfo *get(int id);
 }
 
 #endif
diff --git a/src/resources/specialdb.cpp b/src/resources/specialdb.cpp
new file mode 100644
index 00000000..ac591c4f
--- /dev/null
+++ b/src/resources/specialdb.cpp
@@ -0,0 +1,132 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/specialdb.h"
+
+#include "log.h"
+
+#include "utils/dtor.h"
+#include "utils/xml.h"
+
+
+namespace
+{
+    SpecialInfos mSpecialInfos;
+    bool mLoaded = false;
+}
+
+SpecialInfo::TargetMode SpecialDB::targetModeFromString(const std::string& str)
+{
+    if      (str=="self")   return SpecialInfo::TARGET_SELF;
+    else if (str=="friend") return SpecialInfo::TARGET_FRIEND;
+    else if (str=="enemy")  return SpecialInfo::TARGET_ENEMY;
+    else if (str=="being")  return SpecialInfo::TARGET_BEING;
+    else if (str=="point")  return SpecialInfo::TARGET_POINT;
+
+    logger->log("SpecialDB: Warning, unknown target mode \"%s\"", str.c_str() );
+    return SpecialInfo::TARGET_SELF;
+}
+
+void SpecialDB::load()
+{
+    if (mLoaded)
+        unload();
+
+    logger->log("Initializing special database...");
+
+    XML::Document doc("specials.xml");
+    xmlNodePtr root = doc.rootNode();
+
+    if (!root || !xmlStrEqual(root->name, BAD_CAST "specials"))
+    {
+        logger->log("Error loading specials file specials.xml");
+        return;
+    }
+
+    std::string setName;
+
+    for_each_xml_child_node(set, root)
+    {
+        if (xmlStrEqual(set->name, BAD_CAST "set"))
+        {
+            setName = XML::getProperty(set, "name", "Actions");
+
+
+            for_each_xml_child_node(special, set)
+            {
+                if (xmlStrEqual(special->name, BAD_CAST "special"))
+                {
+                    SpecialInfo *info = new SpecialInfo();
+                    int id = XML::getProperty(special, "id", 0);
+                    info->id = id;
+                    info->set = setName;
+                    info->name = XML::getProperty(special, "name", "");
+                    info->icon = XML::getProperty(special, "icon", "");
+
+                    info->isActive = XML::getBoolProperty(special, "active", false);
+                    info->targetMode = targetModeFromString(XML::getProperty(special, "target", "self"));
+
+                    info->level = XML::getProperty(special, "level", -1);
+                    info->hasLevel = info->level > -1;
+
+                    info->hasRechargeBar = XML::getBoolProperty(special, "recharge", false);
+                    info->rechargeNeeded = 0;
+                    info->rechargeCurrent = 0;
+
+                    if (mSpecialInfos.find(id) != mSpecialInfos.end())
+                    {
+                        logger->log("SpecialDB: Duplicate special ID %d (ignoring)", id);
+                    } else {
+                        mSpecialInfos[id] = info;
+                    }
+                }
+            }
+        }
+    }
+
+    mLoaded = true;
+}
+
+void SpecialDB::unload()
+{
+
+    delete_all(mSpecialInfos);
+    mSpecialInfos.clear();
+
+    mLoaded = false;
+}
+
+
+SpecialInfo *SpecialDB::get(int id)
+{
+
+    SpecialInfos::iterator i = mSpecialInfos.find(id);
+
+    if (i == mSpecialInfos.end())
+    {
+        return NULL;
+    }
+    else
+    {
+        return i->second;
+    }
+    return NULL;
+}
+
diff --git a/src/resources/specialdb.h b/src/resources/specialdb.h
new file mode 100644
index 00000000..38612c2a
--- /dev/null
+++ b/src/resources/specialdb.h
@@ -0,0 +1,72 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SPECIAL_DB_H
+#define SPECIAL_DB_H
+
+#include <string>
+#include <map>
+
+struct SpecialInfo
+{
+    enum TargetMode
+    {
+        TARGET_SELF,    // no target selection
+        TARGET_FRIEND,  // target friendly being
+        TARGET_ENEMY,   // target hostile being
+        TARGET_BEING,   // target any being
+        TARGET_POINT    // target map location
+    };
+    int id;
+    std::string set; // tab on which the special is shown
+    std::string name; // displayed name of special
+    std::string icon; // filename of graphical icon
+
+    bool isActive; // true when the special can be used
+    TargetMode targetMode; // target mode
+
+    bool hasLevel; // true when the special has levels
+    int level; // level of special when applicable
+
+    bool hasRechargeBar; // true when the special has a recharge bar
+    int rechargeNeeded; // maximum recharge when applicable
+    int rechargeCurrent; // current recharge when applicable
+};
+
+/**
+ * Special information database.
+ */
+namespace SpecialDB
+{
+    void load();
+
+    void unload();
+
+    /** gets the special info for ID. Will return 0 when it is
+     *  a server-specific special.
+     */
+    SpecialInfo *get(int id);
+
+    SpecialInfo::TargetMode targetModeFromString(const std::string& str);
+}
+
+typedef std::map<int, SpecialInfo *> SpecialInfos;
+
+#endif
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index c524c43c..311c9d1a 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -36,13 +36,16 @@
 
 #include <set>
 
-Action *SpriteDef::getAction(SpriteAction action) const
+SpriteReference *SpriteReference::Empty = new SpriteReference(
+                                    paths.getStringValue("spriteErrorFile"), 0);
+
+Action *SpriteDef::getAction(const std::string &action) const
 {
     Actions::const_iterator i = mActions.find(action);
 
     if (i == mActions.end())
     {
-        logger->log("Warning: no action \"%u\" defined!", action);
+        logger->log("Warning: no action \"%s\" defined!", action.c_str());
         return NULL;
     }
 
@@ -63,9 +66,8 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, int variant)
     {
         logger->log("Error, failed to parse %s", animationFile.c_str());
 
-        std::string errorFile = paths.getValue("sprites", "graphics/sprites")
-                                + paths.getValue("spriteErrorFile",
-                                                 "error.xml");
+        std::string errorFile = paths.getStringValue("sprites")
+                                + paths.getStringValue("spriteErrorFile");
         if (animationFile != errorFile)
         {
             return load(errorFile, 0);
@@ -82,22 +84,29 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, int variant)
     return def;
 }
 
+void SpriteDef::substituteAction(std::string complete, std::string with)
+{
+    if (mActions.find(complete) == mActions.end())
+    {
+        Actions::iterator i = mActions.find(with);
+        if (i != mActions.end())
+        {
+            mActions[complete] = i->second;
+        }
+    }
+}
+
 void SpriteDef::substituteActions()
 {
-    substituteAction(ACTION_STAND, ACTION_DEFAULT);
-    substituteAction(ACTION_WALK, ACTION_STAND);
-    substituteAction(ACTION_WALK, ACTION_RUN);
-    substituteAction(ACTION_ATTACK, ACTION_STAND);
-    substituteAction(ACTION_ATTACK_SWING, ACTION_ATTACK);
-    substituteAction(ACTION_ATTACK_STAB, ACTION_ATTACK_SWING);
-    substituteAction(ACTION_ATTACK_BOW, ACTION_ATTACK_STAB);
-    substituteAction(ACTION_ATTACK_THROW, ACTION_ATTACK_SWING);
-    substituteAction(ACTION_CAST_MAGIC, ACTION_ATTACK_SWING);
-    substituteAction(ACTION_USE_ITEM, ACTION_CAST_MAGIC);
-    substituteAction(ACTION_SIT, ACTION_STAND);
-    substituteAction(ACTION_SLEEP, ACTION_SIT);
-    substituteAction(ACTION_HURT, ACTION_STAND);
-    substituteAction(ACTION_DEAD, ACTION_HURT);
+    substituteAction(SpriteAction::STAND, SpriteAction::DEFAULT);
+    substituteAction(SpriteAction::MOVE, SpriteAction::STAND);
+    substituteAction(SpriteAction::ATTACK, SpriteAction::STAND);
+    substituteAction(SpriteAction::CAST_MAGIC, SpriteAction::ATTACK);
+    substituteAction(SpriteAction::USE_ITEM, SpriteAction::CAST_MAGIC);
+    substituteAction(SpriteAction::SIT, SpriteAction::STAND);
+    substituteAction(SpriteAction::SLEEP, SpriteAction::SIT);
+    substituteAction(SpriteAction::HURT, SpriteAction::STAND);
+    substituteAction(SpriteAction::DEAD, SpriteAction::HURT);
 }
 
 void SpriteDef::loadSprite(xmlNodePtr spriteNode, int variant,
@@ -169,20 +178,19 @@ void SpriteDef::loadAction(xmlNodePtr node, int variant_offset)
     }
     ImageSet *imageSet = si->second;
 
-    SpriteAction actionType = makeSpriteAction(actionName);
-    if (actionType == ACTION_INVALID)
+    if (actionName == SpriteAction::INVALID)
     {
         logger->log("Warning: Unknown action \"%s\" defined in %s",
                 actionName.c_str(), getIdPath().c_str());
         return;
     }
     Action *action = new Action;
-    mActions[actionType] = action;
+    mActions[actionName] = action;
 
     // When first action set it as default direction
-    if (mActions.empty())
+    if (mActions.size() == 1)
     {
-        mActions[ACTION_DEFAULT] = action;
+        mActions[SpriteAction::DEFAULT] = action;
     }
 
     // Load animations
@@ -283,8 +291,7 @@ void SpriteDef::includeSprite(xmlNodePtr includeNode)
     if (filename.empty())
         return;
 
-    XML::Document doc(paths.getValue("sprites", "graphics/sprites/")
-                      + filename);
+    XML::Document doc(paths.getStringValue("sprites") + filename);
     xmlNodePtr rootNode = doc.rootNode();
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "sprite"))
@@ -296,18 +303,6 @@ void SpriteDef::includeSprite(xmlNodePtr includeNode)
     loadSprite(rootNode, 0);
 }
 
-void SpriteDef::substituteAction(SpriteAction complete, SpriteAction with)
-{
-    if (mActions.find(complete) == mActions.end())
-    {
-        Actions::iterator i = mActions.find(with);
-        if (i != mActions.end())
-        {
-            mActions[complete] = i->second;
-        }
-    }
-}
-
 SpriteDef::~SpriteDef()
 {
     // Actions are shared, so ensure they are deleted only once.
@@ -331,63 +326,6 @@ SpriteDef::~SpriteDef()
     }
 }
 
-SpriteAction SpriteDef::makeSpriteAction(const std::string &action)
-{
-    if (action.empty() || action == "default")
-        return ACTION_DEFAULT;
-
-    if (action == "stand")
-        return ACTION_STAND;
-    else if (action == "walk")
-        return ACTION_WALK;
-    else if (action == "run")
-        return ACTION_RUN;
-    else if (action == "attack")
-        return ACTION_ATTACK;
-    else if (action == "attack_swing")
-        return ACTION_ATTACK_SWING;
-    else if (action == "attack_stab")
-        return ACTION_ATTACK_STAB;
-    else if (action == "attack_bow")
-        return ACTION_ATTACK_BOW;
-    else if (action == "attack_throw")
-        return ACTION_ATTACK_THROW;
-    else if (action == "special0")
-        return ACTION_SPECIAL_0;
-    else if (action == "special1")
-        return ACTION_SPECIAL_1;
-    else if (action == "special2")
-        return ACTION_SPECIAL_2;
-    else if (action == "special3")
-        return ACTION_SPECIAL_3;
-    else if (action == "special4")
-        return ACTION_SPECIAL_4;
-    else if (action == "special5")
-        return ACTION_SPECIAL_5;
-    else if (action == "special6")
-        return ACTION_SPECIAL_6;
-    else if (action == "special7")
-        return ACTION_SPECIAL_7;
-    else if (action == "special8")
-        return ACTION_SPECIAL_8;
-    else if (action == "special9")
-        return ACTION_SPECIAL_9;
-    else if (action == "cast_magic")
-        return ACTION_CAST_MAGIC;
-    else if (action == "use_item")
-        return ACTION_USE_ITEM;
-    else if (action == "sit")
-        return ACTION_SIT;
-    else if (action == "sleep")
-        return ACTION_SLEEP;
-    else if (action == "hurt")
-        return ACTION_HURT;
-    else if (action == "dead")
-        return ACTION_DEAD;
-    else
-        return ACTION_INVALID;
-}
-
 SpriteDirection SpriteDef::makeSpriteDirection(const std::string &direction)
 {
     if (direction.empty() || direction == "default")
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 5bb6078e..18a70c9b 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -26,42 +26,60 @@
 
 #include <libxml/tree.h>
 
+#include <list>
 #include <map>
 #include <string>
 
 class Action;
 class ImageSet;
 
-enum SpriteAction
+struct SpriteReference
 {
-    ACTION_DEFAULT = 0,
-    ACTION_STAND,
-    ACTION_WALK,
-    ACTION_RUN,
-    ACTION_ATTACK,
-    ACTION_ATTACK_SWING,
-    ACTION_ATTACK_STAB,
-    ACTION_ATTACK_BOW,
-    ACTION_ATTACK_THROW,
-    ACTION_SPECIAL_0,
-    ACTION_SPECIAL_1,
-    ACTION_SPECIAL_2,
-    ACTION_SPECIAL_3,
-    ACTION_SPECIAL_4,
-    ACTION_SPECIAL_5,
-    ACTION_SPECIAL_6,
-    ACTION_SPECIAL_7,
-    ACTION_SPECIAL_8,
-    ACTION_SPECIAL_9,
-    ACTION_CAST_MAGIC,
-    ACTION_USE_ITEM,
-    ACTION_SIT,
-    ACTION_SLEEP,
-    ACTION_HURT,
-    ACTION_DEAD,
-    ACTION_INVALID
+    static SpriteReference *Empty;
+
+    SpriteReference() {}
+
+    SpriteReference(std::string sprite, int variant)
+    { this->sprite = sprite; this->variant = variant; }
+
+    std::string sprite;
+    int variant;
 };
 
+struct SpriteDisplay
+{
+    std::string image;
+    std::list<SpriteReference*> sprites;
+    std::list<std::string> particles;
+};
+
+typedef std::list<SpriteReference*>::const_iterator SpriteRefs;
+
+/*
+ * Remember those are the main action.
+ * Action subtypes, e.g.: "attack_bow" are to be passed by items.xml after
+ * an ACTION_ATTACK call.
+ * Which special to be use to to be passed with the USE_SPECIAL call.
+ * Running, walking, ... is a sub-type of moving.
+ * ...
+ * Please don't add hard-coded subtypes here!
+ */
+namespace SpriteAction
+{
+    static const std::string DEFAULT = "stand";
+    static const std::string STAND = "stand";
+    static const std::string SIT = "sit";
+    static const std::string SLEEP = "sleep";
+    static const std::string DEAD = "dead";
+    static const std::string MOVE = "walk";
+    static const std::string ATTACK = "attack";
+    static const std::string HURT = "hurt";
+    static const std::string USE_SPECIAL = "special";
+    static const std::string CAST_MAGIC = "magic";
+    static const std::string USE_ITEM = "item";
+    static const std::string INVALID = "";
+}
+
 enum SpriteDirection
 {
     DIRECTION_DEFAULT = 0,
@@ -86,12 +104,7 @@ class SpriteDef : public Resource
         /**
          * Returns the specified action.
          */
-        Action *getAction(SpriteAction action) const;
-
-        /**
-         * Converts a string into a SpriteAction enum.
-         */
-        static SpriteAction makeSpriteAction(const std::string &action);
+        Action *getAction(const std::string &action) const;
 
         /**
          * Converts a string into a SpriteDirection enum.
@@ -147,12 +160,12 @@ class SpriteDef : public Resource
          * When there are no animations defined for the action "complete", its
          * animations become a copy of those of the action "with".
          */
-        void substituteAction(SpriteAction complete, SpriteAction with);
+        void substituteAction(std::string complete, std::string with);
 
         typedef std::map<std::string, ImageSet*> ImageSets;
         typedef ImageSets::iterator ImageSetIterator;
 
-        typedef std::map<SpriteAction, Action*> Actions;
+        typedef std::map<std::string, Action*> Actions;
 
         ImageSets mImageSets;
         Actions mActions;
diff --git a/src/gui/theme.cpp b/src/resources/theme.cpp
index 3d0bd5d3..8de275ae 100644
--- a/src/gui/theme.cpp
+++ b/src/resources/theme.cpp
@@ -21,7 +21,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/theme.h"
+#include "resources/theme.h"
 
 #include "client.h"
 #include "configuration.h"
@@ -48,7 +48,7 @@ Theme *Theme::mInstance = 0;
 static void initDefaultThemePath()
 {
     ResourceManager *resman = ResourceManager::getInstance();
-    defaultThemePath = branding.getValue("guiThemePath", "");
+    defaultThemePath = branding.getStringValue("guiThemePath");
 
     if (!defaultThemePath.empty() && resman->isDirectory(defaultThemePath))
         return;
@@ -81,8 +81,8 @@ Skin::~Skin()
 
 void Skin::updateAlpha(float minimumOpacityAllowed)
 {
-    const float alpha = std::max((double)minimumOpacityAllowed,
-                                 config.getValue("guialpha", 0.8f));
+    const float alpha = std::max(minimumOpacityAllowed,
+                                              config.getFloatValue("guialpha"));
 
     for_each(mBorder.grid, mBorder.grid + 9,
              std::bind2nd(std::mem_fun(&Image::setAlpha), alpha));
@@ -111,7 +111,7 @@ Theme::Theme():
 {
     initDefaultThemePath();
 
-    config.addListener("guialpha", this);
+    listen(CHANNEL_CONFIG);
     loadColors();
 
     mColors[HIGHLIGHT].ch = 'H';
@@ -130,7 +130,6 @@ Theme::Theme():
 Theme::~Theme()
 {
     delete_all(mSkins);
-    config.removeListener("guialpha", this);
     delete_all(mProgressColors);
 }
 
@@ -209,9 +208,14 @@ void Theme::updateAlpha()
         iter->second->updateAlpha(mMinimumOpacity);
 }
 
-void Theme::optionChanged(const std::string &)
+void Theme::event(Channels channel, const Mana::Event &event)
 {
-    updateAlpha();
+    if (channel == CHANNEL_CONFIG &&
+        event.getName() == EVENT_CONFIGOPTIONCHANGED &&
+        event.getString("option") == "guialpha")
+    {
+        updateAlpha();
+    }
 }
 
 Skin *Theme::readSkin(const std::string &filename)
@@ -343,9 +347,9 @@ void Theme::prepareThemePath()
     instance();
 
     // Try theme from settings
-    if (!tryThemePath(config.getValue("theme", "")))
+    if (!tryThemePath(config.getStringValue("theme")))
         // Try theme from branding
-        if (!tryThemePath(branding.getValue("theme", "")))
+        if (!tryThemePath(branding.getStringValue("theme")))
             // Use default
             mThemePath = defaultThemePath;
 
diff --git a/src/gui/theme.h b/src/resources/theme.h
index 3a5aa41a..f830c94f 100644
--- a/src/gui/theme.h
+++ b/src/resources/theme.h
@@ -24,8 +24,8 @@
 #ifndef SKIN_H
 #define SKIN_H
 
-#include "configlistener.h"
 #include "graphics.h"
+#include "listener.h"
 
 #include "gui/palette.h"
 
@@ -100,7 +100,7 @@ class Skin
         Image *mStickyImageDown;   /**< Sticky Button Image */
 };
 
-class Theme : public Palette, public ConfigListener
+class Theme : public Palette, public Mana::Listener
 {
     public:
         static Theme *instance();
@@ -218,7 +218,7 @@ class Theme : public Palette, public ConfigListener
          */
         void setMinimumOpacity(float minimumOpacity);
 
-        void optionChanged(const std::string &);
+        void event(Channels channel, const Mana::Event &event);
 
     private:
         Theme();
diff --git a/src/gui/userpalette.cpp b/src/resources/userpalette.cpp
index 9e202fe9..a6b5bc03 100644
--- a/src/gui/userpalette.cpp
+++ b/src/resources/userpalette.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "userpalette.h"
+#include "resources/userpalette.h"
 
 #include "configuration.h"
 #include "client.h"
diff --git a/src/gui/userpalette.h b/src/resources/userpalette.h
index be02db10..be02db10 100644
--- a/src/gui/userpalette.h
+++ b/src/resources/userpalette.h
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index c8857745..0fd1c291 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -53,21 +53,21 @@ static void initDefaultWallpaperPaths()
     ResourceManager *resman = ResourceManager::getInstance();
 
     // Init the path
-    wallpaperPath = branding.getValue("wallpapersPath", "");
+    wallpaperPath = branding.getStringValue("wallpapersPath");
 
     if (wallpaperPath.empty() || !resman->isDirectory(wallpaperPath))
-        wallpaperPath = paths.getValue("wallpapers", "");
+        wallpaperPath = paths.getStringValue("wallpapers");
 
     if (wallpaperPath.empty() || !resman->isDirectory(wallpaperPath))
         wallpaperPath = "graphics/images/";
 
     // Init the default file
-    wallpaperFile = branding.getValue("wallpaperFile", "");
+    wallpaperFile = branding.getStringValue("wallpaperFile");
 
     if (!wallpaperFile.empty() && !resman->isDirectory(wallpaperFile))
         return;
     else
-        wallpaperFile = paths.getValue("wallpaperFile", "");
+        wallpaperFile = paths.getStringValue("wallpaperFile");
 
     if (wallpaperFile.empty() || resman->isDirectory(wallpaperFile))
         wallpaperFile = "login_wallpaper.png";
@@ -80,7 +80,7 @@ bool wallpaperCompare(WallpaperData a, WallpaperData b)
 
     return (aa > ab || (aa == ab && a.width > b.width));
 }
-
+#include <iostream>
 void Wallpaper::loadWallpapers()
 {
     wallpaperData.clear();
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index a8d33a43..7ef433ea 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -33,14 +33,16 @@ SimpleAnimation::SimpleAnimation(Animation *animation):
     mAnimation(animation),
     mAnimationTime(0),
     mAnimationPhase(0),
-    mCurrentFrame(mAnimation->getFrame(0))
+    mCurrentFrame(mAnimation->getFrame(0)),
+    mInitialized(true)
 {
 }
 
 SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode):
     mAnimation(new Animation),
     mAnimationTime(0),
-    mAnimationPhase(0)
+    mAnimationPhase(0),
+    mInitialized(false)
 {
     initializeAnimation(animationNode);
     mCurrentFrame = mAnimation->getFrame(0);
@@ -48,7 +50,8 @@ SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode):
 
 SimpleAnimation::~SimpleAnimation()
 {
-    delete mAnimation;
+    if (mAnimation)
+        delete mAnimation;
 }
 
 bool SimpleAnimation::draw(Graphics *graphics, int posX, int posY) const
@@ -79,38 +82,55 @@ void SimpleAnimation::setFrame(int frame)
 
 void SimpleAnimation::update(int timePassed)
 {
-    mAnimationTime += timePassed;
-
-    while (mAnimationTime > mCurrentFrame->delay && mCurrentFrame->delay > 0)
+    if (mInitialized)
     {
-        mAnimationTime -= mCurrentFrame->delay;
-        mAnimationPhase++;
+        mAnimationTime += timePassed;
 
-        if (mAnimationPhase >= mAnimation->getLength())
-            mAnimationPhase = 0;
+        while (mAnimationTime > mCurrentFrame->delay && mCurrentFrame->delay > 0)
+        {
+            mAnimationTime -= mCurrentFrame->delay;
+            mAnimationPhase++;
 
-        mCurrentFrame = mAnimation->getFrame(mAnimationPhase);
+            if (mAnimationPhase >= mAnimation->getLength())
+                mAnimationPhase = 0;
+
+            mCurrentFrame = mAnimation->getFrame(mAnimationPhase);
+        }
     }
 }
 
 int SimpleAnimation::getLength() const
 {
-    return mAnimation->getLength();
+    if (mAnimation)
+        return mAnimation->getLength();
+    else
+        return 0;
 }
 
 Image *SimpleAnimation::getCurrentImage() const
 {
-    return mCurrentFrame->image;
+    if (mCurrentFrame)
+        return mCurrentFrame->image;
+    else
+        return NULL;
 }
 
 void SimpleAnimation::initializeAnimation(xmlNodePtr animationNode)
 {
+    mInitialized = false;
+
+    if (!animationNode)
+        return;
+
     ImageSet *imageset = ResourceManager::getInstance()->getImageSet(
         XML::getProperty(animationNode, "imageset", ""),
         XML::getProperty(animationNode, "width", 0),
         XML::getProperty(animationNode, "height", 0)
     );
 
+    if (!imageset)
+        return;
+
     // Get animation frames
     for (   xmlNodePtr frameNode = animationNode->xmlChildrenNode;
             frameNode;
@@ -172,4 +192,6 @@ void SimpleAnimation::initializeAnimation(xmlNodePtr animationNode)
             mAnimation->addTerminator();
         }
     }
+
+    mInitialized = true;
 }
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index a8a43b33..e679442e 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -78,6 +78,9 @@ class SimpleAnimation
 
         /** Current animation phase. */
         Frame *mCurrentFrame;
+
+        /**  Tell whether the animation is ready */
+        bool mInitialized;
 };
 
 #endif
diff --git a/src/sound.cpp b/src/sound.cpp
index fa39e49b..c64e10d8 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -21,14 +21,14 @@
 
 #include <SDL.h>
 
+#include "configuration.h"
+#include "localplayer.h"
 #include "log.h"
 #include "sound.h"
 
 #include "resources/resourcemanager.h"
 #include "resources/soundeffect.h"
 
-#include "configuration.h"
-
 Sound::Sound():
     mInstalled(false),
     mSfxVolume(100),
@@ -142,7 +142,7 @@ void Sound::setSfxVolume(int volume)
 static Mix_Music *loadMusic(const std::string &filename)
 {
     ResourceManager *resman = ResourceManager::getInstance();
-    std::string path = resman->getPath("music/" + filename);
+    std::string path = resman->getPath(paths.getStringValue("music") + filename);
 
     if (path.find(".zip/") != std::string::npos ||
         path.find(".zip\\") != std::string::npos)
@@ -152,7 +152,7 @@ static Mix_Music *loadMusic(const std::string &filename)
         logger->log("Loading music \"%s\" from temporary file tempMusic.ogg",
                     path.c_str());
         bool success = resman->copyFile(
-                               paths.getValue("music", "music/")
+                               paths.getStringValue("music")
                                + filename, "tempMusic.ogg");
         if (success)
             path = resman->getPath("tempMusic.ogg");
@@ -228,17 +228,38 @@ void Sound::fadeOutMusic(int ms)
     }
 }
 
-void Sound::playSfx(const std::string &path)
+void Sound::playSfx(const std::string &path, int x, int y)
 {
     if (!mInstalled || path.empty())
         return;
 
+    std::string tmpPath;
+    if (!path.find("sfx/"))
+        tmpPath = path;
+    else
+        tmpPath = paths.getValue("sfx", "sfx/") + path;
     ResourceManager *resman = ResourceManager::getInstance();
-    SoundEffect *sample = resman->getSoundEffect(path);
+    SoundEffect *sample = resman->getSoundEffect(tmpPath);
     if (sample)
     {
         logger->log("Sound::playSfx() Playing: %s", path.c_str());
-        sample->play(0, 120);
+        int vol = 120;
+        if (player_node && x > 0 && y > 0)
+        {
+            int dx = player_node->getTileX() - x;
+            int dy = player_node->getTileY() - y;
+            if (dx < 0)
+                dx = -dx;
+            if (dy < 0)
+                dy = -dy;
+            int dist = dx > dy ? dx : dy;
+
+            // Check for negative values
+            if (dist * 8 > vol)
+                return;
+            vol -= dist * 8;
+        }
+        sample->play(0, vol);
     }
 }
 
diff --git a/src/sound.h b/src/sound.h
index bf5dc3f6..bfb3837b 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -86,8 +86,10 @@ class Sound
          * Plays an item.
          *
          * @param path The resource path to the sound file.
+         * @param x The vertical distance of the sound in tiles.
+         * @param y The horizontal distance of the sound in tiles.
          */
-        void playSfx(const std::string &path);
+        void playSfx(const std::string &path, int x = 0, int y = 0);
 
     private:
         /** Logs various info about sound device. */
diff --git a/src/sprite.h b/src/sprite.h
index 847c01a6..38db8b41 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -1,7 +1,6 @@
 /*
  *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2010  The Mana Developers
  *
  *  This file is part of The Mana Client.
  *
@@ -22,64 +21,90 @@
 #ifndef SPRITE_H
 #define SPRITE_H
 
+#include "resources/spritedef.h"
+
 class Graphics;
+class Image;
 
-/**
- * A sprite is some visible object on a map. This abstract class defines the
- * interface used by the map to sort and display the sprite.
- */
 class Sprite
 {
     public:
+        virtual ~Sprite() {}
+
+        /**
+         * Resets the sprite.
+         *
+         * @returns true if the sprite changed, false otherwise
+         */
+        virtual bool reset() = 0;
+
         /**
-         * Destructor.
+         * Plays an action using the current direction.
+         *
+         * @returns true if the sprite changed, false otherwise
          */
-        virtual
-        ~Sprite() {}
+        virtual bool play(std::string action) = 0;
 
         /**
-         * Draws the sprite to the given graphics context.
+         * Inform the animation of the passed time so that it can output the
+         * correct animation frame.
          *
-         * Note: this function could be simplified if the graphics context
-         * would support setting a translation offset. It already does this
-         * partly with the clipping rectangle support.
+         * @returns true if the sprite changed, false otherwise
          */
-        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const = 0;
+        virtual bool update(int time) = 0;
 
         /**
-         * Returns the horizontal size of the sprites graphical representation
-         * in pixels or 0 when it is undefined.
+         * Draw the current animation frame at the coordinates given in screen
+         * pixels.
          */
-        virtual int getWidth() const
-        { return 0; }
+        virtual bool draw(Graphics* graphics, int posX, int posY) const = 0;
 
         /**
-         * Returns the vertical size of the sprites graphical representation
-         * in pixels or 0 when it is undefined.
+         * Gets the width in pixels of the image of the current frame
          */
-        virtual int getHeight() const
-        { return 0; }
+        virtual int getWidth() const = 0;
 
         /**
-         * Returns the pixel Y coordinate of the sprite.
+         * Gets the height in pixels of the image of the current frame
          */
-        virtual int getPixelY() const = 0;
+        virtual int getHeight() const = 0;
 
         /**
-         * Returns the number of Image layers used to draw the sprite.
+         * Returns a reference to the current image being drawn.
          */
-        virtual int getNumberOfLayers() const
-        { return 0; }
+        virtual const Image* getImage() const = 0;
 
         /**
-         * Returns the current alpha value used to draw the sprite.
+         * Sets the direction.
+         *
+         * @returns true if the sprite changed, false otherwise
          */
-        virtual float getAlpha() const = 0;
+        virtual bool setDirection(SpriteDirection direction) = 0;
 
         /**
-         * Sets the alpha value used to draw the sprite.
+         * Sets the alpha value of the animated sprite
          */
-        virtual void setAlpha(float alpha) = 0;
+        virtual void setAlpha(float alpha)
+        { mAlpha = alpha; }
+
+        /**
+         * Returns the current alpha opacity of the animated sprite.
+         */
+        virtual float getAlpha() const
+        { return mAlpha; }
+
+        /**
+         * Returns the current frame number for the sprite.
+         */
+        virtual size_t getCurrentFrame() const = 0;
+
+        /**
+         * Returns the frame count for the sprite.
+         */
+        virtual size_t getFrameCount() const = 0;
+
+    protected:
+        float mAlpha;                  /**< The alpha opacity used to draw */
 };
 
-#endif
+#endif // SPRITE_H
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp
index 1f913f4a..d7c3f17a 100644
--- a/src/statuseffect.cpp
+++ b/src/statuseffect.cpp
@@ -21,11 +21,10 @@
 
 #include "statuseffect.h"
 
+#include "event.h"
 #include "log.h"
 #include "sound.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "utils/xml.h"
 
 #include "configuration.h"
@@ -52,7 +51,7 @@ void StatusEffect::playSFX()
 void StatusEffect::deliverMessage()
 {
     if (!mMessage.empty())
-        localChatTab->chatLog(mMessage, BY_SERVER);
+        SERVER_NOTICE(mMessage)
 }
 
 Particle *StatusEffect::getParticle()
@@ -70,22 +69,22 @@ AnimatedSprite *StatusEffect::getIcon()
     else
     {
         AnimatedSprite *sprite = AnimatedSprite::load(
-             paths.getValue("sprites", "graphics/sprites/") + mIcon);
+                                       paths.getStringValue("sprites") + mIcon);
         if (false && sprite)
         {
-            sprite->play(ACTION_DEFAULT);
+            sprite->play(SpriteAction::DEFAULT);
             sprite->reset();
         }
         return sprite;
     }
 }
 
-SpriteAction StatusEffect::getAction()
+std::string StatusEffect::getAction()
 {
     if (mAction.empty())
-        return ACTION_INVALID;
+        return SpriteAction::INVALID;
     else
-        return SpriteDef::makeSpriteAction(mAction);
+        return mAction;
 }
 
 
diff --git a/src/statuseffect.h b/src/statuseffect.h
index fc0e7336..3f715a16 100644
--- a/src/statuseffect.h
+++ b/src/statuseffect.h
@@ -56,9 +56,9 @@ public:
     AnimatedSprite *getIcon();
 
     /**
-     * Retrieves an action to perform, or ACTION_INVALID
+     * Retrieves an action to perform, or SpriteAction::INVALID
      */
-    SpriteAction getAction();
+    std::string getAction();
 
     /**
      * Determines whether the particle effect should be restarted when the
diff --git a/src/text.cpp b/src/text.cpp
index f6c71dba..53b21e79 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -27,11 +27,9 @@
 #include "textrenderer.h"
 
 #include "gui/gui.h"
-#include "gui/palette.h"
-#include "gui/theme.h"
 
-#include "resources/resourcemanager.h"
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include <guichan/font.hpp>
 
@@ -41,17 +39,22 @@ Image *Text::mBubbleArrow;
 
 Text::Text(const std::string &text, int x, int y,
            gcn::Graphics::Alignment alignment,
-           const gcn::Color* color, bool isSpeech) :
+           const gcn::Color* color, bool isSpeech,
+           gcn::Font *font) :
     mText(text),
     mColor(color),
-    mFont(gui->getFont()),
     mIsSpeech(isSpeech)
 {
+    if (!font)
+        mFont = gui->getFont();
+    else
+        mFont = font;
+
     if (textManager == 0)
     {
         textManager = new TextManager;
         Image *sbImage = Theme::getImageFromTheme("bubble.png|W:#"
-            + config.getValue("speechBubblecolor", "000000"));
+            + config.getStringValue("speechBubblecolor"));
         mBubble.grid[0] = sbImage->getSubImage(0, 0, 5, 5);
         mBubble.grid[1] = sbImage->getSubImage(5, 0, 5, 5);
         mBubble.grid[2] = sbImage->getSubImage(10, 0, 5, 5);
@@ -62,7 +65,7 @@ Text::Text(const std::string &text, int x, int y,
         mBubble.grid[7] = sbImage->getSubImage(5, 10, 5, 5);
         mBubble.grid[8] = sbImage->getSubImage(10, 10, 5, 5);
         mBubbleArrow = sbImage->getSubImage(0, 15, 15, 10);
-        const float bubbleAlpha = config.getValue("speechBubbleAlpha", 1.0);
+        const float bubbleAlpha = config.getFloatValue("speechBubbleAlpha");
         for (int i = 0; i < 9; i++)
         {
              mBubble.grid[i]->setAlpha(bubbleAlpha);
@@ -145,8 +148,8 @@ void Text::draw(gcn::Graphics *graphics, int xOff, int yOff)
 
 FlashText::FlashText(const std::string &text, int x, int y,
                      gcn::Graphics::Alignment alignment,
-                     const gcn::Color *color) :
-    Text(text, x, y, alignment, color),
+                     const gcn::Color *color, gcn::Font *font) :
+    Text(text, x, y, alignment, color, false, font),
     mTime(0)
 {
 }
diff --git a/src/text.h b/src/text.h
index fcfaf6ed..70dd4a89 100644
--- a/src/text.h
+++ b/src/text.h
@@ -24,7 +24,6 @@
 #define TEXT_H
 
 #include "graphics.h"
-#include "guichanfwd.h"
 
 #include <guichan/color.hpp>
 
@@ -40,7 +39,8 @@ class Text
          */
         Text(const std::string &text, int x, int y,
              gcn::Graphics::Alignment alignment,
-             const gcn::Color *color, bool isSpeech = false);
+             const gcn::Color *color, bool isSpeech = false,
+             gcn::Font *font = 0);
 
         /**
          * Destructor. The text is removed from the screen.
@@ -84,7 +84,8 @@ class FlashText : public Text
     public:
         FlashText(const std::string &text, int x, int y,
                   gcn::Graphics::Alignment alignment,
-                  const gcn::Color* color);
+                  const gcn::Color* color,
+                  gcn::Font *font = 0);
 
         /**
          * Remove the text from the screen
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index c9b5fc18..0753cc38 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -36,10 +36,10 @@ TextParticle::TextParticle(Map *map, const std::string &text,
 {
 }
 
-void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
+bool TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
 {
-    if (!mAlive)
-        return;
+    if (!isAlive())
+        return false;
 
     int screenX = (int) mPos.x + offsetX;
     int screenY = (int) mPos.y - (int) mPos.z + offsetY;
@@ -50,4 +50,6 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
     TextRenderer::renderText(graphics, mText,
             screenX, screenY, gcn::Graphics::CENTER,
             color, mTextFont, mOutline, false);
+
+    return true;
 }
diff --git a/src/textparticle.h b/src/textparticle.h
index a61bf8d9..79af7406 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -22,7 +22,6 @@
 #ifndef TEXTPARTICLE_H
 #define TEXTPARTICLE_H
 
-#include "guichanfwd.h"
 #include "particle.h"
 
 class TextParticle : public Particle
@@ -38,7 +37,7 @@ class TextParticle : public Particle
         /**
          * Draws the particle image.
          */
-        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const;
+        virtual bool draw(Graphics *graphics, int offsetX, int offsetY) const;
 
         // hack to improve text visibility
         virtual int getPixelY() const
diff --git a/src/textrenderer.h b/src/textrenderer.h
index 4da868f1..fccdd3c7 100644
--- a/src/textrenderer.h
+++ b/src/textrenderer.h
@@ -24,7 +24,7 @@
 
 #include "graphics.h"
 
-#include "gui/theme.h"
+#include "resources/theme.h"
 
 /**
  * Class for text rendering. Used by the TextParticle, the Text and FlashText
diff --git a/src/tileset.h b/src/tileset.h
index 56bc4547..6c2ee394 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -33,8 +33,8 @@ class Tileset : public ImageSet
         /**
          * Constructor.
          */
-        Tileset(Image *img, int w, int h, int firstGid):
-            ImageSet(img, w, h),
+        Tileset(Image *img, int w, int h, int firstGid, int margin, int spacing):
+            ImageSet(img, w, h, margin, spacing),
             mFirstGid(firstGid)
         {
         }
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index 31aa7bf9..3d2e3b80 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -269,7 +269,6 @@ static char* getSelection(Display *dpy, Window us, Atom selection)
       return (char*)data;
     }
   }
-  printf("Timeout\n");
   return NULL;
 }
 
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 445427fe..96b67370 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -26,7 +26,7 @@
 #include <cstdarg>
 #include <cstdio>
 
-const int UTF8_MAX_SIZE = 10;
+static int UTF8_MAX_SIZE = 10;
 
 std::string &trim(std::string &str)
 {
@@ -155,7 +155,8 @@ bool isWordSeparator(char chr)
     return (chr == ' ' || chr == ',' || chr == '.' || chr == '"');
 }
 
-const std::string findSameSubstring(const std::string &str1, const std::string &str2)
+const std::string findSameSubstring(const std::string &str1,
+                                    const std::string &str2)
 {
     int minLength = str1.length() > str2.length() ? str2.length() : str1.length();
     for (int f = 0; f < minLength; f ++)
@@ -176,6 +177,18 @@ const char* getSafeUtf8String(std::string text)
     return buf;
 }
 
+bool getBoolFromString(const std::string &text, bool def)
+{
+    std::string a = text;
+    toLower(trim(a));
+    if (a == "true" || a == "1" || a == "on" || a == "yes" || a == "y")
+        return true;
+    if (a == "false" || a == "0" || a == "off" || a == "no" || a == "n")
+        return false;
+    else
+        return def;
+}
+
 std::string autocomplete(std::vector<std::string> &candidates,
                          std::string base)
 {
@@ -210,3 +223,9 @@ std::string autocomplete(std::vector<std::string> &candidates,
 
     return newName;
 }
+
+std::string normalize(const std::string &name)
+{
+    std::string normalized = name;
+    return toLower(trim(normalized));;
+}
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 5f1f05f0..2c6fad78 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -120,13 +120,33 @@ std::string removeColors(std::string msg);
  */
 int compareStrI(const std::string &a, const std::string &b);
 
+/**
+ * Tells wether the character is a word separator.
+ */
 bool isWordSeparator(char chr);
 
-const std::string findSameSubstring(const std::string &str1, const std::string &str2);
+const std::string findSameSubstring(const std::string &str1,
+                                    const std::string &str2);
 
 const char* getSafeUtf8String(std::string text);
 
+/**
+ * Returns a bool value depending on the given string value.
+ *
+ * @param text the string used to get the bool value
+ * @return a boolean value..
+ */
+bool getBoolFromString(const std::string &text, bool def = false);
+
+/**
+ * Returns the most approaching string of base from candidates.
+ */
 std::string autocomplete(std::vector<std::string> &candidates,
                          std::string base);
 
+/**
+ * Normalize a string, which means lowercase and trim it.
+ */
+std::string normalize(const std::string &name);
+
 #endif // UTILS_STRINGUTILS_H
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 9835f88c..65eb1370 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -21,15 +21,20 @@
 
 #include "utils/xml.h"
 
+#include <iostream>
+#include <fstream>
+#include <cstring>
+
+#include <libxml/parser.h>
+#include <libxml/xmlerror.h>
+
 #include "log.h"
 
 #include "resources/resourcemanager.h"
 
+#include "utils/stringutils.h"
 #include "utils/zlib.h"
 
-#include <libxml/parser.h>
-#include <libxml/xmlerror.h>
-
 namespace XML
 {
     static void xmlLogger(void *ctx, xmlErrorPtr error);
@@ -129,6 +134,18 @@ namespace XML
         return def;
     }
 
+    bool getBoolProperty(xmlNodePtr node, const char* name, bool def)
+    {
+        bool ret = def;
+        xmlChar *prop = xmlGetProp(node, BAD_CAST name);
+        if (prop)
+        {
+            ret = getBoolFromString((char*) prop, def);
+            xmlFree(prop);
+        }
+        return ret;
+    }
+
     xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name)
     {
         for_each_xml_child_node(child, parent)
@@ -149,7 +166,7 @@ namespace XML
             logger->log("Error in unknown xml file on line %d",
                         error->line);
 
-        logger->log(error->message);
+        logger->log("%s", error->message);
 
         // No need to keep errors around
         xmlCtxtResetLastError(error->ctxt);
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 8ffecb76..48e66787 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -60,14 +60,14 @@ namespace XML
     };
 
     /**
-     * Gets an integer property from an xmlNodePtr.
+     * Gets an floating point property from an xmlNodePtr.
      */
-    int getProperty(xmlNodePtr node, const char *name, int def);
+    double getFloatProperty(xmlNodePtr node, const char *name, double def);
 
     /**
-     * Gets an floating point property from an xmlNodePtr.
+     * Gets an integer property from an xmlNodePtr.
      */
-    double getFloatProperty(xmlNodePtr node, const char *name, double def);
+    int getProperty(xmlNodePtr node, const char *name, int def);
 
     /**
      * Gets a string property from an xmlNodePtr.
@@ -76,6 +76,11 @@ namespace XML
                             const std::string &def);
 
     /**
+     * Gets a boolean property from an xmlNodePtr.
+     */
+    bool getBoolProperty(xmlNodePtr node, const char *name, bool def);
+
+    /**
      * Finds the first child node with the given name
      */
     xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name);
diff --git a/src/variabledata.h b/src/variabledata.h
new file mode 100644
index 00000000..19e09795
--- /dev/null
+++ b/src/variabledata.h
@@ -0,0 +1,131 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef VARIABLEDATA_H
+#define VARIABLEDATA_H
+
+#include <string>
+
+class ActorSprite;
+class Item;
+
+namespace Mana
+{
+
+class VariableData
+{
+    public:
+    enum DataType
+    {
+        DATA_NONE,
+        DATA_INT,
+        DATA_STRING,
+        DATA_FLOAT,
+        DATA_BOOL,
+        DATA_ITEM,
+        DATA_ACTOR
+    };
+
+    virtual ~VariableData() {};
+
+    virtual int getType() const = 0;
+};
+
+class IntData : public VariableData
+{
+public:
+    IntData(int value) { mData = value; }
+
+    int getData() const { return mData; }
+
+    int getType() const { return DATA_INT; }
+
+private:
+    int mData;
+};
+
+class StringData : public VariableData
+{
+public:
+    StringData(const std::string &value) { mData = value; }
+
+    const std::string &getData() const { return mData; }
+
+    int getType() const { return DATA_STRING; }
+
+private:
+    std::string mData;
+};
+
+class FloatData : public VariableData
+{
+public:
+    FloatData(double value) { mData = value; }
+
+    double getData() const { return mData; }
+
+    int getType() const { return DATA_FLOAT; }
+
+private:
+    double mData;
+};
+
+class BoolData : public VariableData
+{
+public:
+    BoolData(bool value) { mData = value; }
+
+    bool getData() const { return mData; }
+
+    int getType() const { return DATA_BOOL; }
+
+private:
+    bool mData;
+};
+
+class ItemData : public VariableData
+{
+public:
+    ItemData(Item *value) { mData = value; }
+
+    Item *getData() const { return mData; }
+
+    int getType() const { return DATA_ITEM; }
+
+private:
+    Item *mData;
+};
+
+class ActorData : public VariableData
+{
+public:
+    ActorData(ActorSprite *value) { mData = value; }
+
+    ActorSprite *getData() const { return mData; }
+
+    int getType() const { return DATA_ACTOR; }
+
+private:
+    ActorSprite *mData;
+};
+
+} // namespace Mana
+
+#endif
diff --git a/src/winver.h b/src/winver.h
index fa85216e..773693bb 100644
--- a/src/winver.h
+++ b/src/winver.h
@@ -1,6 +1,6 @@
 /* VERSION DEFINITIONS */
-#define VER_MAJOR 0
-#define VER_MINOR 5
-#define VER_RELEASE 1
+#define VER_MAJOR 1
+#define VER_MINOR 0
+#define VER_RELEASE 0
 #define VER_BUILD 0
-#define PACKAGE_VERSION "0.5.1.0"
+#define PACKAGE_VERSION "1.0.0.0"
diff --git a/tools/dyecmd/src/dye.cpp b/tools/dyecmd/src/dye.cpp
index 77da2ebb..77da2ebb 100755..100644
--- a/tools/dyecmd/src/dye.cpp
+++ b/tools/dyecmd/src/dye.cpp
diff --git a/tools/dyecmd/src/dye.h b/tools/dyecmd/src/dye.h
index 922f3370..922f3370 100755..100644
--- a/tools/dyecmd/src/dye.h
+++ b/tools/dyecmd/src/dye.h
diff --git a/tools/dyecmd/src/dyecmd.cpp b/tools/dyecmd/src/dyecmd.cpp
index 5e06e500..5e06e500 100755..100644
--- a/tools/dyecmd/src/dyecmd.cpp
+++ b/tools/dyecmd/src/dyecmd.cpp
diff --git a/tools/dyecmd/src/imagewriter.cpp b/tools/dyecmd/src/imagewriter.cpp
index d237abbf..d237abbf 100755..100644
--- a/tools/dyecmd/src/imagewriter.cpp
+++ b/tools/dyecmd/src/imagewriter.cpp
diff --git a/tools/dyecmd/src/imagewriter.h b/tools/dyecmd/src/imagewriter.h
index a8bcdf57..a8bcdf57 100755..100644
--- a/tools/dyecmd/src/imagewriter.h
+++ b/tools/dyecmd/src/imagewriter.h
diff --git a/update-creator.sh b/update-creator.sh
index 6acb8522..fa6534e1 100755
--- a/update-creator.sh
+++ b/update-creator.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
-find \( -name \*.cpp \
-        -o -name \*.h \
-        -o -name \*.txt \
-        -o -name \*.xml \
-        -o -name \*.mana \
-     \) ! -wholename \*/CMakeFiles/\* \
-        ! -name CMakeCache.txt \
-  | sort > mana.files
+git ls-files \*.cpp \
+             \*.h \
+             \*.txt \
+             \*.xml \
+             \*.mana \
+    > mana.files